Author: bpapez
Date: Thu Oct 18 16:33:35 2007
New Revision: 18934
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18934&repname=
=3Djahia
Log:
http://www.jahia.net/jira/browse/ESI-355: SP3: op/edit is now kept even for=
pages visible only in live mode - such policy is not compliant with the ES=
I edit/preview and Compare passtrough policy
- the op-mode is not taken from the URL if ESI cache is activated, so in th=
is case the user looses the last used mode if he browses on a page, where h=
e has no edit rights and he was in not NORMAL mode before
- on the logout-URL the op/edit is removed
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Proce=
ssingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D18934&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/params/ProcessingC=
ontext.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java Thu Oct 18 16:33:35 2007
@@ -1914,7 +1914,7 @@
theUrl.append(getSiteURLPart(getSite().getSiteKey()));
}
String paramOpMode =3D getParameter(OPERATION_MODE_PARAMETER);
- String opModeToUse =3D paramOpMode !=3D null ? paramOpMode : getOp=
Mode();
+ String opModeToUse =3D paramOpMode !=3D null && !settings().isEsiC=
acheActivated() ? paramOpMode : getOpMode();
theUrl.append(getOpModeURLPart(opModeToUse));
theUrl.append(getCacheModeURLPart(getCacheStatus()));
if (pageID > 0) {
@@ -2014,7 +2014,9 @@
}
=
theUrl.append(getSiteURLPart());
- theUrl.append(getOpModeURLPart(getOpMode()));
+ if (params.indexOf("engine_params=3Dlogout") =3D=3D -1) {
+ theUrl.append(getOpModeURLPart(getOpMode()));
+ } =
if (getContentPage() !=3D null) {
theUrl.append(getPageURLKeyPart(getContentPage().getID()));
if (extraJahiaParams =3D=3D null
@@ -2359,7 +2361,7 @@
theUrl.append(getEngineURLPart(CORE_ENGINE_NAME));
theUrl.append(getSiteURLPart());
String paramOpMode =3D getParameter(OPERATION_MODE_PARAMETER);
- String opModeToUse =3D paramOpMode !=3D null ? paramOpMode : getOp=
Mode();
+ String opModeToUse =3D paramOpMode !=3D null && !settings().isEsiC=
acheActivated() ? paramOpMode : getOpMode();
theUrl.append(getOpModeURLPart(opModeToUse)); =
theUrl.append(appendParam(LANGUAGE_CODE, code));
=
@@ -2429,7 +2431,7 @@
theUrl.append(getEngineURLPart(CORE_ENGINE_NAME));
theUrl.append(getSiteURLPart(aSite.getSiteKey()));
String paramOpMode =3D getParameter(OPERATION_MODE_PARAMETER);
- String opModeToUse =3D paramOpMode !=3D null ? paramOpMode : getOp=
Mode();
+ String opModeToUse =3D paramOpMode !=3D null && !settings().isEsiC=
acheActivated() ? paramOpMode : getOpMode();
theUrl.append(getOpModeURLPart(opModeToUse)); =
=
theUrl.append(REGISTRY.getEsiURLGeneratorService().getESITemplURLP=
art(
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
