Fixed permission update on folder to show error message when deep children have alrea...

diff --git a/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java b/src/gr/grnet/pithos/web/client/FolderPropertiesDialog.java
index bb93fc5..ce9030c 100644 (file)
--- 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");\r
                             Scheduler.get().scheduleDeferred(newFolder);\r
                        }\r
+                       else if (((RestException) t).getHttpStatusCode() == Response.SC_CONFLICT) {\r
+                               app.displayError("Cannot set permissions. Probably subfolders or files already have permissions set");\r
+                       }\r
+                       else\r
+                               app.displayError("Wrror modifying folder: " + t.getMessage());\r
                     }\r
                     else\r
                        app.displayError("System error modifying folder: " + t.getMessage());\r

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 (file)
--- 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());