Author: tdraier
Date: Wed Aug 29 12:10:03 2007
New Revision: 18293
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18293&repname=
=3Djahia
Log:
fixed issue with fields acl (JAHIA-2193)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/Fields=
EditHelperAbstract.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/JahiaEngin=
eTools.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/App=
lication_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Big=
Text_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Boo=
lean_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Cat=
egory_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/DAV=
File_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Dat=
e_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Flo=
at_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Int=
eger_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Pag=
e_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Sma=
llText_Field.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Und=
efined_Field.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
FieldsEditHelperAbstract.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/FieldsEditHelperAbstract.java&r=
ev=3D18293&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/data/fields/Fields=
EditHelperAbstract.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/Fields=
EditHelperAbstract.java Wed Aug 29 12:10:03 2007
@@ -247,7 +247,7 @@
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldA=
CL (ctnListFieldAcls,fieldId);
if (acl !=3D null) {
doUpdate =3D acl.getPermission (jParams.getUser (),
- JahiaBaseACL.WRITE_R=
IGHTS, true);
+ JahiaBaseACL.WRITE_R=
IGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFieldAcls, fieldId)=
);
}
} else {
doUpdate =3D true;
@@ -402,8 +402,8 @@
processingEntryLoadRequest);
if (EngineToolBox.getInstance().processFieldTypes (the=
Field, theContainer, engineName, jParams, mode, engineMap)) {
=
- if ("true".equals(jParams.getParameter (
- "apply_change_to_all_lang_" + theField.get=
ID ()))) {
+ if (jParams.getParameter (
+ "apply_change_to_all_lang_" + theField.get=
ID ()) !=3D null) {
applyChangeToAllLang (engineName,theField,
jahiaContentContainerFacade,
engineMap, jParams);
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/Jahi=
aEngineTools.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/JahiaEngineTools.java&rev=3D18293&r=
epname=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/JahiaEngin=
eTools.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/JahiaEngin=
eTools.java Wed Aug 29 12:10:03 2007
@@ -89,6 +89,14 @@
return null;
}
=
+ public static boolean isCtnListFieldACLDefined (HashMap aclsMap, int f=
ieldID) {
+ if (aclsMap =3D=3D null)
+ return false;
+ Integer I1 =3D (Integer) aclsMap.get (new Integer (fieldID));
+ Integer I2 =3D (Integer) aclsMap.get (new Integer (0));
+ return I1 !=3D null && I2 !=3D null && !I1.equals(I2);
+ }
+
/**
* Build a map that contains a pair of [fieldID (INTEGER),aclID (INTEG=
ER)] for fields of a
* given container list. The acl is the one set at container list leve=
l , not at field level
@@ -120,7 +128,7 @@
String prop =3D null;
JahiaField aField =3D null;
JahiaFieldDefinition theDef =3D null;
-
+ map.put(new Integer(0), new Integer(cList.getAclID()));
Enumeration fList =3D theContainer.getFields ();
while (fList.hasMoreElements ()) {
aField =3D (JahiaField) fList.nextElement ();
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Application_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Application_Field.java&rev=
=3D18293&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/shared/App=
lication_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/App=
lication_Field.java Wed Aug 29 12:10:03 2007
@@ -568,7 +568,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size() > 0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/BigText_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/BigText_Field.java&rev=3D182=
93&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/shared/Big=
Text_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Big=
Text_Field.java Wed Aug 29 12:10:03 2007
@@ -483,7 +483,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size() > 0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Boolean_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Boolean_Field.java&rev=3D182=
93&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/shared/Boo=
lean_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Boo=
lean_Field.java Wed Aug 29 12:10:03 2007
@@ -187,7 +187,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size()>0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Category_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Category_Field.java&rev=3D18=
293&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/shared/Cat=
egory_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Cat=
egory_Field.java Wed Aug 29 12:10:03 2007
@@ -175,7 +175,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size() > 0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/DAVFile_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/DAVFile_Field.java&rev=3D182=
93&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/shared/DAV=
File_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/DAV=
File_Field.java Wed Aug 29 12:10:03 2007
@@ -243,7 +243,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size() > 0) {
final JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFiel=
dACL(ctnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Date_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Date_Field.java&rev=3D18293&=
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/shared/Dat=
e_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Dat=
e_Field.java Wed Aug 29 12:10:03 2007
@@ -199,7 +199,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size()>0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Float_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Float_Field.java&rev=3D18293=
&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/shared/Flo=
at_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Flo=
at_Field.java Wed Aug 29 12:10:03 2007
@@ -187,7 +187,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size()>0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Integer_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Integer_Field.java&rev=3D182=
93&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/shared/Int=
eger_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Int=
eger_Field.java Wed Aug 29 12:10:03 2007
@@ -188,7 +188,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size()>0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Page_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Page_Field.java&rev=3D18293&=
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/shared/Pag=
e_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Pag=
e_Field.java Wed Aug 29 12:10:03 2007
@@ -191,7 +191,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size()>0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/SmallText_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/SmallText_Field.java&rev=3D1=
8293&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/shared/Sma=
llText_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Sma=
llText_Field.java Wed Aug 29 12:10:03 2007
@@ -309,7 +309,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size() > 0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Undefined_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Undefined_Field.java&rev=3D1=
8293&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/shared/Und=
efined_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Und=
efined_Field.java Wed Aug 29 12:10:03 2007
@@ -183,7 +183,7 @@
if (theContainer.getListID() !=3D 0 && ctnListFieldAcls !=3D n=
ull && ctnListFieldAcls.size()>0) {
JahiaBaseACL acl =3D JahiaEngineTools.getCtnListFieldACL(c=
tnListFieldAcls, fieldId);
if (acl !=3D null) {
- editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, true);
+ editable =3D acl.getPermission(jParams.getUser(), Jahi=
aBaseACL.WRITE_RIGHTS, JahiaEngineTools.isCtnListFieldACLDefined(ctnListFie=
ldAcls, fieldId));
}
} else {
editable =3D true;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
