Author: bpapez
Date: Mon Jan 7 15:26:35 2008
New Revision: 19461
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19461&repname=
=3Djahia
Log:
Upport a fix from Jahia 4.2 for theField being null in getCurrentPagesFilter
Modified:
trunk/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.j=
ava
trunk/core/src/java/org/jahia/services/sitemap/JahiaSiteMapService.java
Modified: trunk/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEn=
gine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/workflow/AdvancedWorkflowEngine.java&rev=3D19461&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
--- trunk/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.j=
ava (original)
+++ trunk/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.j=
ava Mon Jan 7 15:26:35 2008
@@ -41,6 +41,7 @@
import org.jahia.services.pages.JahiaPageService;
import org.jahia.services.scheduler.BackgroundJob;
import org.jahia.services.scheduler.SchedulerService;
+import org.jahia.services.sitemap.JahiaSiteMapService;
import org.jahia.services.sites.SiteLanguageSettings;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.version.ActivationTestResults;
@@ -143,10 +144,15 @@
*/
public String renderLink(final ProcessingContext jParams, final Object=
theObj)
throws JahiaException {
- final String params =3D "?screen=3Ddisplay&obj=3D" + theObj;
+ String params =3D "?screen=3Ddisplay&obj=3D" + theObj;
// Per default set the engines to the notification completed pages=
if the
// user has admin accesses.
// _lastDisplay.put(jParams.getSessio nID(), _tabOptions[1]);
+ String pagesFilter =3D jParams.getParameter(JahiaSiteMapService.PA=
GES_FILTER);
+ if (pagesFilter !=3D null) {
+ params =3D params + "&" + JahiaSiteMapService.PAGES_FILTER + "=
=3D"
+ + pagesFilter;
+ }
=
return jParams.composeEngineUrl(ActivationJob.WORKFLOW_TYPE, param=
s);
}
Modified: trunk/core/src/java/org/jahia/services/sitemap/JahiaSiteMapServic=
e.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/sitemap/JahiaSiteMapService.java&rev=3D19461&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/sitemap/JahiaSiteMapService.java=
(original)
+++ trunk/core/src/java/org/jahia/services/sitemap/JahiaSiteMapService.java=
Mon Jan 7 15:26:35 2008
@@ -54,7 +54,12 @@
* @version 1.0
*/
public class JahiaSiteMapService extends JahiaService {
-
+ /**
+ * The pages filter parameter =
+ */
+ public static final String PAGES_FILTER =3D "pagesFilter"; =
+ public static final String FILTER_INIT_PARAMETER =3D "filterInitParame=
ter";
+ =
/**
* Returns the singleton instance of the service, and creates it if th=
ere
* wasn't one.
@@ -77,14 +82,25 @@
PagesFilter pagesFilter =3D null;
=
if (jParams !=3D null) {
- final String pagesFilterClassName =3D theField.getDefinition()=
.getProperty(JahiaFieldDefinitionProperties.PAGE_SELECTION_FILTER_PROP); =
- final JahiaPageBaseService jahiaPageBaseService =3D JahiaPageB=
aseService.getInstance(); =
- String fieldDefValue =3D ""; =
- ContentPage contentPage =3D jahiaPageBaseService.lookupContent=
Page(theField.getPageID(), false); =
- if (contentPage !=3D null) { =
- fieldDefValue =3D theField.getDefinition(). =
- getDefaultValue(contentPage.getPageTempl=
ateID(jParams)); =
- } =
+ final String pagesFilterClassName =3D (theField !=3D null ? th=
eField
+ .getDefinition()
+ .getProperty(
+ JahiaFieldDefinitionProperties.PAGE_SELECTION_=
FILTER_PROP)
+ : jParams.getParameter(JahiaSiteMapService.PAGES_FILTE=
R));
+ final JahiaPageBaseService jahiaPageBaseService =3D JahiaPageB=
aseService
+ .getInstance();
+ String fieldDefValue =3D "";
+ if (theField !=3D null) {
+ ContentPage contentPage =3D jahiaPageBaseService
+ .lookupContentPage(theField.getPageID(), false);
+ if (contentPage !=3D null) {
+ fieldDefValue =3D theField.getDefinition().getDefaultV=
alue(
+ contentPage.getPageTemplateID(jParams));
+ }
+ } else {
+ fieldDefValue =3D jParams
+ .getParameter(JahiaSiteMapService.FILTER_INIT_PARA=
METER);
+ }
=
if (pagesFilterClassName !=3D null
&& pagesFilterClassName.length() > 0) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
