From bac098d0411b73027dae4a52ef823ef527fe2a2f Mon Sep 17 00:00:00 2001 From: Christos Stathis Date: Mon, 26 Sep 2011 15:00:31 +0300 Subject: [PATCH] Fixed permission update on folder to show error message when deep children have already permissions set --- src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java | 5 +++++ src/gr/grnet/pithos/web/client/foldertree/Folder.java | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java index bb93fc5..ce9030c 100644 --- a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java +++ b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java @@ -398,6 +398,11 @@ public class FolderPropertiesDialog extends DialogBox { newFolder.setHeader("Content-Length", "0"); Scheduler.get().scheduleDeferred(newFolder); } + else if (((RestException) t).getHttpStatusCode() == Response.SC_CONFLICT) { + app.displayError("Cannot set permissions. Probably subfolders or files already have permissions set"); + } + else + app.displayError("Wrror modifying folder: " + t.getMessage()); } else app.displayError("System error modifying folder: " + t.getMessage()); diff --git a/src/gr/grnet/pithos/web/client/foldertree/Folder.java b/src/gr/grnet/pithos/web/client/foldertree/Folder.java index 3888d1e..81bb4b7 100644 --- a/src/gr/grnet/pithos/web/client/foldertree/Folder.java +++ b/src/gr/grnet/pithos/web/client/foldertree/Folder.java @@ -169,11 +169,6 @@ public class Folder extends Resource { } } - inheritedPermissionsFrom = response.getHeader("X-Object-Shared-By"); - String rawPermissions = response.getHeader("X-Object-Sharing"); - if (rawPermissions != null) - parsePermissions(rawPermissions); - subfolders.clear(); //This is necessary in case we update a pre-existing Folder so that stale subfolders won't show up files.clear(); JSONValue json = JSONParser.parseStrict(response.getText()); -- 1.7.10.4