Author: bpapez
Date: Sat Sep 1 23:36:24 2007
New Revision: 18342
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18342&repname=
=3Djahia
Log:
* Do not show content marked for deletion in EDIT mode
* Bugfix and slight optimization for Struts and JSF URL creation
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=3D18342&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 Sat Sep 1 23:36:24 2007
@@ -800,7 +800,7 @@
newLoadRequest.setWithMarkedForDeletion(true);
} else if (EDIT.equals(getOpMode())) {
newLoadRequest.setWithDeleted(false);
- newLoadRequest.setWithMarkedForDeletion(true);
+ newLoadRequest.setWithMarkedForDeletion(false);
}
if (this.entryLoadRequest.getWorkflowState() > 0) {
this.entryLoadRequest =3D newLoadRequest;
@@ -2067,9 +2067,13 @@
theUrl.append("/");
}
theUrl.append(strutsAction);
-
- theUrl.append(getSiteAndModeAndPageAsURLParams("?"));
- String paramSep =3D "&";
+ =
+ String paramSep =3D "?";
+ String urlParams =3D getSiteAndModeAndPageAsURLParams(paramSep);
+ theUrl.append(urlParams);
+ if (urlParams.length() > 0)
+ paramSep =3D "&"; =
+ =
String paramValue;
final Enumeration propertyNames =3D extraJahiaParams.propertyNames=
();
while (propertyNames.hasMoreElements()) {
@@ -2166,18 +2170,22 @@
theUrl.append("/");
}
theUrl.append(facesPage);
-
+ String paramSep =3D "?";
if (getContentPage() !=3D null) {
final String paramValue =3D getPageURLKeyPart(getContentPage()
.getID());
- final String paramSep =3D "?";
if (paramValue !=3D null && !paramValue.trim().equals("")) {
theUrl.append(paramSep);
theUrl.append(paramValue);
+ paramSep =3D "&";
}
}
- theUrl.append(getSiteAndModeAndPageAsURLParams("?"));
- String paramSep =3D "&";
+ =
+ String urlParams =3D getSiteAndModeAndPageAsURLParams(paramSep);
+ theUrl.append(urlParams);
+ if (urlParams.length() > 0)
+ paramSep =3D "&";
+ =
String paramValue; =
final Enumeration propertyNames =3D extraJahiaParams.propertyNames=
();
while (propertyNames.hasMoreElements()) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
