Author: sshyrkov
Date: Fri Sep 21 15:23:37 2007
New Revision: 18621
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18621&repname=
=3Djahia
Log:
Do not retrieve file usages at all if the warnings are ignored
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/file=
manager/DAVFilemanager_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/filemanager/DAVFilemanager_Engine.j=
ava&rev=3D18621&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/filemanage=
r/DAVFilemanager_Engine.java Fri Sep 21 15:23:37 2007
@@ -1916,14 +1916,14 @@
final boolean cannotRead =3D permissions.charAt(JahiaBaseACL.R=
EAD_RIGHTS) =3D=3D '-';
=
if (cannotRead && aclEntry.charAt(ManageRights.V_REM_ACL_ENTRY=
) !=3D '1') {
- final List usages =3D jahiaWebdavBaseService.findUsages(da=
v.getPath(), jParams, false);
- if (usages !=3D null && usages.size() > 0) {
- // Since we are cutting READ rights on the dav file, w=
e need to check its usages and check
- // the FileFields' rights.
-
- if (!ignoreWarning) {
- final List futur403 =3D areWeGoingtoGenerateA403(u=
sages, subject, jParams);
- if (futur403.size() > 0) return futur403;
+ if (!ignoreWarning) {
+ final List usages =3D jahiaWebdavBaseService.findUsage=
s(dav.getPath(), jParams, false);
+ if (usages !=3D null && usages.size() > 0) {
+ // Since we are cutting READ rights on the dav fil=
e, we need to check its usages and check
+ // the FileFields' rights.
+ =
+ final List futur403 =3D areWeGoingtoGenerateA4=
03(usages, subject, jParams);
+ if (futur403.size() > 0) return futur403;
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
