tdraier 2005/04/15 18:02:20 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/engines/filemanager
DAVFilemanager_Engine.java
Log:
error when changing permission
Revision Changes Path
1.20.2.3.2.5 +19 -4
jahia/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.java.diff?r1=1.20.2.3.2.4&r2=1.20.2.3.2.5&f=h
Index: DAVFilemanager_Engine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/filemanager/Attic/DAVFilemanager_Engine.java,v
retrieving revision 1.20.2.3.2.4
retrieving revision 1.20.2.3.2.5
diff -u -r1.20.2.3.2.4 -r1.20.2.3.2.5
--- DAVFilemanager_Engine.java 6 Apr 2005 15:42:07 -0000
1.20.2.3.2.4
+++ DAVFilemanager_Engine.java 15 Apr 2005 16:02:20 -0000
1.20.2.3.2.5
@@ -299,6 +299,9 @@
}
} else if (lastScreen.equals ("rightsMgmt")) {
result = saveAcl (objectDav, jParams, engineMap);
+ if (!result) {
+ jParams.getRequest().setAttribute("error",
"org.jahia.engines.filemanager.Filemanager_Engine.permissionError.label");
+ }
} else if (lastScreen.equals ("createDir")) {
jParams.getRequest ().getSession ().setAttribute
("changeDir",
TableEntry.javascriptEncode(objectDav.getPath
()));
@@ -1023,18 +1026,30 @@
String permissions = submitedACLEntries[i].substring (8, 11);
if (submitedACLEntries[i].charAt (0) == '1') {
logger.debug ("Added ACL entry for user : " + subject);
- dav.changePermissions (subject, permissions);
+ boolean res = dav.changePermissions (subject, permissions);
+ if (!res) {
+ return res;
+ }
} else if (submitedACLEntries[i].charAt (11) == '%') {
logger.debug ("Cut inheritance for user : " + subject);
- dav.changePermissions (subject, permissions);
+ boolean res = dav.changePermissions (subject, permissions);
+ if (!res) {
+ return res;
+ }
} else if (submitedACLEntries[i].charAt (2) == '1') {
logger.debug ("Remove ACL for user : " + subject);
- dav.revokePermissions (subject);
+ boolean res = dav.revokePermissions (subject);
+ if (!res) {
+ return res;
+ }
continue;
} else if (submitedACLEntries[i].charAt (3) == '1') {
logger.debug ("Permissions have changed to " +
permissions + " for user : " + subject);
- dav.changePermissions (subject, permissions);
+ boolean res = dav.changePermissions (subject, permissions);
+ if (!res) {
+ return res;
+ }
}
if (submitedACLEntries[i].charAt (1) == '1') {
/** @todo Reset child permissions. */
