Author: bpapez
Date: Tue Sep 18 10:08:05 2007
New Revision: 18530
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18530&repname=
=3Djahia
Log:
JAHIA-2283: Compare mode behaviour when page was never validated yet (multi=
language mode)
- in checkLocales we switched the language if mode was NORMAL or COMPARE an=
d the page did not exist in staging. Now the check is only for NORMAL and n=
ot for COMPARE, so we do not switch the locale for compare.
JAHIA-2217: Keeping the op/compare and op/preview paramater from one page t=
o the other
- when creating the URLs do not consider the resolved operation mode, which=
depends on the edit rights of the user, but consider the operation mode in=
the URL parameter
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=3D18530&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 Tue Sep 18 10:08:05 2007
@@ -1889,7 +1889,8 @@
|| aContentPage.getSiteID() =3D=3D getSite().getID()) {
theUrl.append(getSiteURLPart(getSite().getSiteKey()));
}
- theUrl.append(getOpModeURLPart(getOpMode()));
+ String paramOpMode =3D getParameter(OPERATION_MODE_PARAMETER);
+ theUrl.append(getOpModeURLPart(paramOpMode !=3D null ? paramOpMode=
: getOpMode()));
theUrl.append(getCacheModeURLPart(getCacheStatus()));
if (pageID > 0) {
theUrl
@@ -2349,7 +2350,8 @@
theUrl.append(getJahiaCoreHttpPath());
theUrl.append(getEngineURLPart(CORE_ENGINE_NAME));
theUrl.append(getSiteURLPart());
- theUrl.append(getOpModeURLPart(getOpMode()));
+ String paramOpMode =3D getParameter(OPERATION_MODE_PARAMETER);
+ theUrl.append(getOpModeURLPart(paramOpMode !=3D null ? paramOpMode=
: getOpMode())); =
theUrl.append(appendParam(LANGUAGE_CODE, code));
=
if (getContentPage() !=3D null)
@@ -3240,7 +3242,7 @@
}
=
public void checkLocales() throws JahiaException {
- if ((getOpMode().equals(NORMAL) || getOpMode().equals(COMPARE))
+ if (getOpMode().equals(NORMAL)
&& !getContentPage().hasEntries(ContentPage.ACTIVE_PAGE_IN=
FOS,
getLocale().toString())) {
final ArrayList siteLanguages =3D getSite()
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
