Author: bpapez
Date: Wed Jul 4 16:25:03 2007
New Revision: 17872
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17872&repname=
=3Djahia
Log:
Acl was not inherited correctly, when using the static create method
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/fields/ContentPag=
eField.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/fields/Cont=
entPageField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/fields/ContentPageField.java&rev=3D17872&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-4-1-BRANCH/src/java/org/jahia/services/fields/ContentPag=
eField.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/fields/ContentPag=
eField.java Wed Jul 4 16:25:03 2007
@@ -79,7 +79,7 @@
activeAndStagedDBValues);
}
=
- private static synchronized ContentPageField create (int siteID,
+ private static ContentPageField create (int siteID,
int pageID, int c=
ontainerID,
int fieldDefID, i=
nt parentAclID,
int aclID,
@@ -88,24 +88,23 @@
int pageLinkID, S=
tring creator,
ParamBean jParams)
throws JahiaException {
- JahiaPage thePage =3D ServicesRegistry.getInstance ().getJahiaPage=
Service ().createPage (
- siteID,
- pageID, pageType, title, pageDefID, remoteURL, pageLinkID,=
creator, aclID,
- jParams);
ContentPageField result =3D
(ContentPageField) ContentField.createField (siteID, pageI=
D,
containerID, fieldDefID,
FieldTypes.PAGE,
ConnectionTypes.LOCAL,
parentAclID, aclID);
- //EntrySaveRequest saveRequest =3D new EntrySaveRequest(jParams.ge=
tUser(), jParams.getLocale().toString());
- EntrySaveRequest saveRequest =3D new EntrySaveRequest (jParams.get=
User (),
- jParams.getEntryLoadRequest ().getFirstLocale (false).toSt=
ring ());
- result.preSet (Integer.toString (thePage.getID ()), saveRequest);
+ JahiaPage thePage =3D ServicesRegistry.getInstance ().getJahiaPage=
Service ().createPage (
+ siteID,
+ pageID, pageType, title, pageDefID, remoteURL, pageLinkID,=
creator, result.getAclID(),
+ jParams); =
+
+ result.setPageID(thePage.getID (), jParams.getUser());
+ =
return result;
}
=
- public static synchronized ContentPageField createNewPage (int siteID,
+ public static ContentPageField createNewPage (int siteID,
int pageID,=
int containerID,
int fieldDe=
fID, int parentAclID,
int aclID,
@@ -118,7 +117,7 @@
creator, jParams);
}
=
- public static synchronized ContentPageField createPageLink (int siteID,
+ public static ContentPageField createPageLink (int siteID,
int pageID=
, int containerID,
int fieldD=
efID,
int parent=
AclID, int aclID,
@@ -131,7 +130,7 @@
creator, jParams);
}
=
- public static synchronized ContentPageField createRemoteURL (int siteI=
D,
+ public static ContentPageField createRemoteURL (int siteID,
int pageI=
D, int containerID,
int field=
DefID,
int paren=
tAclID, int aclID,
@@ -725,7 +724,6 @@
Set pageSet =3D new HashSet ();
while (dbValuesEntryIter.hasNext ()) {
Map.Entry curMapEntry =3D (Map.Entry) dbValuesEntryIter.next (=
);
- ContentObjectEntryState curEntryState =3D (ContentObjectEntryS=
tate) curMapEntry.getKey ();
String curDBValue =3D (String) curMapEntry.getValue ();
if (curDBValue !=3D null) {
int pageID =3D -1;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
