Author: tdraier
Date: Fri Sep 14 13:18:52 2007
New Revision: 18476

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18476&repname=
=3Djahia
Log:
fixed issue with fields acl (JAHIA-2193) (port 18293)

Modified:
    trunk/core/src/java/org/jahia/data/fields/FieldsEditHelperAbstract.java
    trunk/core/src/java/org/jahia/engines/JahiaEngineTools.java
    trunk/core/src/java/org/jahia/engines/shared/Application_Field.java
    trunk/core/src/java/org/jahia/engines/shared/BigText_Field.java
    trunk/core/src/java/org/jahia/engines/shared/Boolean_Field.java
    trunk/core/src/java/org/jahia/engines/shared/Category_Field.java
    trunk/core/src/java/org/jahia/engines/shared/DAVFile_Field.java
    trunk/core/src/java/org/jahia/engines/shared/Date_Field.java
    trunk/core/src/java/org/jahia/engines/shared/Float_Field.java
    trunk/core/src/java/org/jahia/engines/shared/Integer_Field.java
    trunk/core/src/java/org/jahia/engines/shared/Page_Field.java
    trunk/core/src/java/org/jahia/engines/shared/SmallText_Field.java
    trunk/core/src/java/org/jahia/engines/shared/Undefined_Field.java

Modified: trunk/core/src/java/org/jahia/data/fields/FieldsEditHelperAbstrac=
t.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/fields/FieldsEditHelperAbstract.java&rev=3D18476&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/data/fields/FieldsEditHelperAbstract.java=
 (original)
+++ trunk/core/src/java/org/jahia/data/fields/FieldsEditHelperAbstract.java=
 Fri Sep 14 13:18:52 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;

Modified: trunk/core/src/java/org/jahia/engines/JahiaEngineTools.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/JahiaEngineTools.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/JahiaEngineTools.java (original)
+++ trunk/core/src/java/org/jahia/engines/JahiaEngineTools.java Fri Sep 14 =
13:18:52 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: trunk/core/src/java/org/jahia/engines/shared/Application_Field.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Application_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/Application_Field.java (or=
iginal)
+++ trunk/core/src/java/org/jahia/engines/shared/Application_Field.java Fri=
 Sep 14 13:18:52 2007
@@ -501,7 +501,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: trunk/core/src/java/org/jahia/engines/shared/BigText_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/BigText_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/BigText_Field.java (origin=
al)
+++ trunk/core/src/java/org/jahia/engines/shared/BigText_Field.java Fri Sep=
 14 13:18:52 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: trunk/core/src/java/org/jahia/engines/shared/Boolean_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Boolean_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/Boolean_Field.java (origin=
al)
+++ trunk/core/src/java/org/jahia/engines/shared/Boolean_Field.java Fri Sep=
 14 13:18:52 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: trunk/core/src/java/org/jahia/engines/shared/Category_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Category_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/Category_Field.java (origi=
nal)
+++ trunk/core/src/java/org/jahia/engines/shared/Category_Field.java Fri Se=
p 14 13:18:52 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: trunk/core/src/java/org/jahia/engines/shared/DAVFile_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/DAVFile_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/DAVFile_Field.java (origin=
al)
+++ trunk/core/src/java/org/jahia/engines/shared/DAVFile_Field.java Fri Sep=
 14 13:18:52 2007
@@ -244,7 +244,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: trunk/core/src/java/org/jahia/engines/shared/Date_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Date_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/Date_Field.java (original)
+++ trunk/core/src/java/org/jahia/engines/shared/Date_Field.java Fri Sep 14=
 13:18:52 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: trunk/core/src/java/org/jahia/engines/shared/Float_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Float_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/Float_Field.java (original)
+++ trunk/core/src/java/org/jahia/engines/shared/Float_Field.java Fri Sep 1=
4 13:18:52 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: trunk/core/src/java/org/jahia/engines/shared/Integer_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Integer_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/Integer_Field.java (origin=
al)
+++ trunk/core/src/java/org/jahia/engines/shared/Integer_Field.java Fri Sep=
 14 13:18:52 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: trunk/core/src/java/org/jahia/engines/shared/Page_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Page_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/Page_Field.java (original)
+++ trunk/core/src/java/org/jahia/engines/shared/Page_Field.java Fri Sep 14=
 13:18:52 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: trunk/core/src/java/org/jahia/engines/shared/SmallText_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/SmallText_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/SmallText_Field.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/engines/shared/SmallText_Field.java Fri S=
ep 14 13:18:52 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: trunk/core/src/java/org/jahia/engines/shared/Undefined_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/Undefined_Field.java&rev=3D18476&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
--- trunk/core/src/java/org/jahia/engines/shared/Undefined_Field.java (orig=
inal)
+++ trunk/core/src/java/org/jahia/engines/shared/Undefined_Field.java Fri S=
ep 14 13:18:52 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

Reply via email to