xlawrence 2005/08/18 15:48:30 CEST
Modified files:
core/src/java/org/jahia/gui HTMLToolBox.java
Log:
re-activate check when drawing Action menus but check that we have an ACL ID
> 0 (in case of empty containerlists)
Revision Changes Path
1.22 +3 -3 jahia/core/src/java/org/jahia/gui/HTMLToolBox.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java.diff?r1=1.21&r2=1.22&f=h
Index: HTMLToolBox.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/gui/HTMLToolBox.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- HTMLToolBox.java 18 Aug 2005 13:36:19 -0000 1.21
+++ HTMLToolBox.java 18 Aug 2005 13:48:30 -0000 1.22
@@ -1056,9 +1056,9 @@
return;
}
- final JahiaBaseACL acl = contentObject.getACL();
- if (acl.getID() > 0 &&
- ! acl.getPermission(jParams.getUser(),
JahiaBaseACL.WRITE_RIGHTS)) {
+ if (contentObject.getID() > 0 &&
+ ! contentObject.getACL().getPermission(jParams.getUser(),
+ JahiaBaseACL.WRITE_RIGHTS)) {
// if the user doesn't have Write access on the object,
don't display the GUI
return;
}
