Author: sshyrkov
Date: Wed Sep 19 09:31:08 2007
New Revision: 18559

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18559&repname=
=3Djahia
Log:
JAHIA-2284: SP3: title displayed for a nstep in the workflow engine is the =
english one and not the one of the current lang =

http://www.jahia.net/jira/browse/JAHIA-2284
Resolution: try to display the title in the current language, if available

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteM=
apAbstractAction.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap=
/SiteMapAbstractAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteMapAbstractAction.java&rev=
=3D18559&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/ajax/sitemap/SiteM=
apAbstractAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/ajax/sitemap/SiteM=
apAbstractAction.java Wed Sep 19 09:31:08 2007
@@ -825,8 +825,12 @@
                         for (final Iterator iterator =3D l.iterator(); ite=
rator.hasNext();) {
                             final ContentObject contentObject =3D (Content=
Object) iterator.next();
                             if (contentObject instanceof ContentSmallTextF=
ield) {
+                                ContentObjectEntryState closestentryState =
=3D contentObject.getEntryState(ContentObjectEntryState.getEntryState(0, jP=
arams.getLocale().getLanguage()), true, true);
+                                if (closestentryState =3D=3D null) {
+                                    closestentryState =3D (ContentObjectEn=
tryState) contentObject.getActiveAndStagingEntryStates().last();
+                                }
                                 pageTitle1 =3D ((ContentSmallTextField) co=
ntentObject).
-                                        getValue((ContentObjectEntryState)=
 contentObject.getActiveAndStagingEntryStates().last()) +
+                                        getValue(closestentryState) +
                                         " (Container " + objectKey.getIDIn=
Type() + ")";
                                 break;
                             }

_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to