Author: xlawrence
Date: Mon Jun 18 11:41:31 2007
New Revision: 17619
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17619&repname=
=3Djahia
Log:
resolve issue http://www.jahia.net/jira/browse/JAHIA-1889: 5.0 Sp2: navigat=
ing in the engines looses the current editing language
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/EngineLang=
uageHelper.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/updatecont=
ainer/UpdateContainer_Engine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/Engi=
neLanguageHelper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/EngineLanguageHelper.java&rev=3D176=
19&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/engines/EngineLang=
uageHelper.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/EngineLang=
uageHelper.java Mon Jun 18 11:41:31 2007
@@ -14,21 +14,18 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
* See the License for the specific language governing permissions and =
* limitations under the License.
- */package org.jahia.engines;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Locale;
-import java.io.Serializable;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+ */
+package org.jahia.engines;
=
import org.jahia.bin.Jahia;
import org.jahia.params.ProcessingContext;
import org.jahia.params.SessionState;
-import org.jahia.utils.LanguageCodeConverters;
import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.utils.LanguageCodeConverters;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Locale;
=
/**
*
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/upda=
tecontainer/UpdateContainer_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/updatecontainer/UpdateContainer_Eng=
ine.java&rev=3D17619&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/engines/updatecont=
ainer/UpdateContainer_Engine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/updatecont=
ainer/UpdateContainer_Engine.java Mon Jun 18 11:41:31 2007
@@ -328,14 +328,24 @@
theEngine.handleActions(jParams, jData);
return null;
} else {
+ final EngineLanguageHelper elh =3D (EngineLanguageHelp=
er) engineMap.get(JahiaEngine.ENGINE_LANGUAGE_HELPER);
+ final StringBuffer buff =3D new StringBuffer();
if ("first".equals(navigation)) {
- newEngineURL =3D jParams.composeEngineUrl(ENGINE_N=
AME, "?cid=3D" + jParams.getParameter("first"));
+ buff.append("?cid=3D").append(jParams.getParameter=
("first")).append("&" +
+ EngineLanguageHelper.ENGINE_LANG_PARAM + "=
=3D").append(elh.getCurrentLanguageCode());
+ newEngineURL =3D jParams.composeEngineUrl(ENGINE_N=
AME, buff.toString());
} else if ("previous".equals(navigation)) {
- newEngineURL =3D jParams.composeEngineUrl(ENGINE_N=
AME, "?cid=3D" + jParams.getParameter("previous"));
+ buff.append("?cid=3D").append(jParams.getParameter=
("previous")).append("&" +
+ EngineLanguageHelper.ENGINE_LANG_PARAM + "=
=3D").append(elh.getCurrentLanguageCode());
+ newEngineURL =3D jParams.composeEngineUrl(ENGINE_N=
AME, buff.toString());
} else if ("next".equals(navigation)) {
- newEngineURL =3D jParams.composeEngineUrl(ENGINE_N=
AME, "?cid=3D" + jParams.getParameter("next"));
+ buff.append("?cid=3D").append(jParams.getParameter=
("next")).append("&" +
+ EngineLanguageHelper.ENGINE_LANG_PARAM + "=
=3D").append(elh.getCurrentLanguageCode());
+ newEngineURL =3D jParams.composeEngineUrl(ENGINE_N=
AME, buff.toString());
} else if ("last".equals(navigation)) {
- newEngineURL =3D jParams.composeEngineUrl(ENGINE_N=
AME, "?cid=3D" + jParams.getParameter("last"));
+ buff.append("?cid=3D").append(jParams.getParameter=
("last")).append("&" +
+ EngineLanguageHelper.ENGINE_LANG_PARAM + "=
=3D").append(elh.getCurrentLanguageCode());
+ newEngineURL =3D jParams.composeEngineUrl(ENGINE_N=
AME, buff.toString());
} else {
throw new IllegalArgumentException("Validation par=
am is unknow: " + navigation);
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
