Author: bpapez
Date: Wed Jul 4 16:26:00 2007
New Revision: 17873
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17873&repname=
=3Djahia
Log:
Acl was not inherited correctly, when using the static create method
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fields/Co=
ntentPageField.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fie=
lds/ContentPageField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/fields/ContentPageField.java&rev=
=3D17873&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/services/fields/Co=
ntentPageField.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fields/Co=
ntentPageField.java Wed Jul 4 16:26:00 2007
@@ -84,21 +84,19 @@
int pageLinkID, S=
tring creator,
ProcessingContext=
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);
- result.postSet(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;
}
=
@@ -372,10 +370,6 @@
jParams.getEntryLoadRequest().getLocales(), tr=
ue);
final JahiaPage thePage =3D contentPage.getPage(loadRequest, P=
rocessingContext.EDIT, jParams.getUser());
=
- final JahiaSaveVersion saveVersion =3D new JahiaSaveVersion(tr=
ue,
- jParams.getSite().isVersioningEnabled(),
- jParams.getEntryLoadRequest().getVersionID());
-
if (thePage =3D=3D null) {
activationTestResults.setStatus (ActivationTestResults.PAR=
TIAL_OPERATION_STATUS);
try {
@@ -707,7 +701,7 @@
Map.Entry curMapEntry =3D (Map.Entry) dbValuesEntryIter.next (=
);
String curDBValue =3D (String) curMapEntry.getValue ();
if (curDBValue !=3D null) {
- int pageID;
+ int pageID =3D -1;
try {
pageID =3D Integer.parseInt (curDBValue);
} catch (NumberFormatException nfe) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
