xlawrence 2005/07/15 17:26:34 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/rights manage_rights.jsp
Log:
integritiy checks are now also performed on sub-pages in case ACL inheritance
is cut
Revision Changes Path
1.3 +3 -5
jahia/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp.diff?r1=1.2&r2=1.3&f=h
Index: manage_rights.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/rights/manage_rights.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- manage_rights.jsp 4 Jul 2005 16:11:06 -0000 1.2
+++ manage_rights.jsp 15 Jul 2005 15:26:33 -0000 1.3
@@ -17,8 +17,6 @@
final String selectUsrGrp = (String)engineMap.get("selectUsrGrp");
final Integer inheritance = (Integer)engineMap.get("inheritance");
- Integer cutRestInherit = (Integer)engineMap.get("cutRestInherit");
- if (cutRestInherit == null) { cutRestInherit = new Integer(0); }
final Integer userNameWidth = new Integer(15);
request.getSession().setAttribute("userNameWidth", userNameWidth);
@@ -51,7 +49,6 @@
var vName = 12;
var vNameSize = <%= userNameWidth.intValue() %>;
var vKey = <%= userNameWidth.intValue() + 13 %>;
-var cut = <%= cutRestInherit.intValue() %>;
var nbOfPerm = 4;
@@ -80,6 +77,7 @@
{
var i = formular.aclEntries.selectedIndex;
var itemSelected = formular.aclEntries.options[i];
+
if (itemSelected.value == "null") {
disableAllSettings();
return;
@@ -102,7 +100,7 @@
formular.readPerm[0].disabled = false;
formular.readPerm[1].disabled = false;
formular.cutRestInherit.checked = true;
- if (itemSelected.value.charAt(vDefaultInherit) == "*" || cut > 0) {
+ if (itemSelected.value.charAt(vDefaultInherit) == "*") {
formular.cutRestInherit.disabled = false;
formular.remACLEntry.disabled = true;
} else {
@@ -550,7 +548,7 @@
<table class="text" border="0" cellspacing="0"
cellpadding="0">
<tr>
<td colspan="2">
- <input type="checkbox"
name="cutRestAllInherit"
+ <input type="checkbox"
name="cutRestAllInherit"
value="cutRestAllInherit"
<% if (inheritance.intValue() >
0) { %>
checked>
