Author: ktlili
Date: Tue Oct 9 12:26:32 2007
New Revision: 18790
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18790&repname=
=3Djahia
Log:
- fix JAHIA-2438: update engine url after apply
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/pages/Page=
Properties_Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/page=
s/PageProperties_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/pages/PageProperties_Engine.java&re=
v=3D18790&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/pages/Page=
Properties_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/pages/Page=
Properties_Engine.java Tue Oct 9 12:26:32 2007
@@ -164,7 +164,7 @@
jParams.getSiteID()) <=3D0 ) {
throw new JahiaForbiddenAccessException();
}
- =
+
if (thePage.checkAdminAccess(user)) {
engineMap.put("enableAuthoring", Boolean.TRUE);
engineMap.put("enableMetadata", Boolean.TRUE);
@@ -725,6 +725,10 @@
}
if (theScreen.equals("apply")) {
engineMap.put("screen", lastScreen);
+ // if urlkey has been changed than engine url has =
to be updated too
+ String engineUrl =3D jParams.composeEngineUrl(ENGI=
NE_NAME, EMPTY_STRING);
+ logger.debug("Engine url: "+engineUrl);
+ engineMap.put(ENGINE_URL_PARAM, engineUrl);
}
// #ifdef LOCK
else {
@@ -819,11 +823,13 @@
}
engineMap.put(RENDER_TYPE_PARAM, new Integer(JahiaEngine.RENDERTYP=
E_FORWARD));
engineMap.put(ENGINE_NAME_PARAM, ENGINE_NAME);
- engineMap.put(ENGINE_URL_PARAM, jParams.composeEngineUrl(ENGINE_NA=
ME, EMPTY_STRING));
+ String engineUrl =3D jParams.composeEngineUrl(ENGINE_NAME, EMPTY_S=
TRING);
+ logger.debug("Engine url: "+engineUrl);
+ engineMap.put(ENGINE_URL_PARAM, engineUrl);
=
// reset engine map to default value
engineMap.remove(ENGINE_OUTPUT_FILE_PARAM);
- =
+
// Init Engine Language Helper
EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap.get(=
JahiaEngine.ENGINE_LANGUAGE_HELPER);
if (elh =3D=3D null) {
@@ -979,8 +985,8 @@
}
=
final Vector vec =3D (constraintTemplates.size() > 0 && checkcount=
=3D=3D 0 ? constraint
- : all); =
- =
+ : all);
+
final EntryLoadRequest loadRequest =3D new EntryLoadRequest(
EntryLoadRequest.ACTIVE_WORKFLOW_STATE, 0, jParams
.getEntryLoadRequest().getLocales());
@@ -1001,7 +1007,7 @@
}
return vec;
}
- =
+
/**
* utility method
* @param s the long string
@@ -1016,8 +1022,8 @@
}
return vlist;
}
- =
- =
+
+
/**
* gets POST form data from the JSP file
*
@@ -1032,7 +1038,7 @@
boolean setPageURLKeySuccessfull =3D setPageURLKeyIfValidAndNotEmp=
ty( jParams, engineMessages, engineMap );
setPageTemplateIDInEngineMapIfNecessary( jParams, engineMap );
saveMessagesIfNotEmpty( engineMessages, jParams);
- =
+
return setPageTitleSuccessfull && setPageURLKeySuccessfull;
}
=
@@ -1117,7 +1123,7 @@
}
}
}
- =
+
/**
* Validate and set page URL key if its present.
* To be valid, the key must :
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
