Author: sshyrkov
Date: Thu Nov 29 17:57:03 2007
New Revision: 19323
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19323&repname=
=3Djahia
Log:
1) Store languagesStates in request scope
2) Do not request already available data (ContentPage.getPage(), site.getLa=
nguageSettings)
3) Obtain only active language settings
Modified:
trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc
Modified: trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/topbar/topmenu.inc&rev=3D19323&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/webapp/jsp/jahia/topbar/topmenu.inc (original)
+++ trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc Thu Nov 29 17:57:03 =
2007
@@ -133,7 +133,7 @@
if (jData.page().checkWriteAccess(user, true)
|| (jData.page().checkAdminAccess(user, true) && jData.page().checkR=
eadAccess(user))) {
=
- Vector languageSettings =3D jParams.getSite().getLanguageSetti=
ngs();
+ Vector languageSettings =3D jParams.getSite().getLanguageSetti=
ngs(true);
if (languageSettings.size() > 0) {
%>
<span>|</span><content:workflowButton title=3D'<%=3DgetCom=
monResource("workflow","workflow",toploc)%>'/><span>:</span>
@@ -146,12 +146,17 @@
resourceBundleState.put(new Integer(2),"workflowEditState"=
);
resourceBundleState.put(new Integer(3),"workflowWaitingSta=
te");
=
- JahiaSite thsite =3D jParams.getSite();
- ContentPage cop =3D
ContentPage.getPage(jData.page().getID());
- Vector siteLangSettings =3D thsite.getLanguageSettings();
- Enumeration siteLangSettingsEnum =3D siteLangSettings.elem=
ents();
+ ContentPage cop =3D
jData.page().getContentPage();
+ Enumeration siteLangSettingsEnum =3D languageSettings.elem=
ents();
=
- Map pageOnlyLanguagesStates =3D
cop.getLanguagesStates(true);
+ Map pageOnlyLanguagesStates =3D null;
+ if (request.getAttribute("languagesStates") !=3D null) {
+ pageOnlyLanguagesStates =3D (Map)
request.getAttribute("languag=
esStates");
+ } else {
+ pageOnlyLanguagesStates =3D
cop.getLanguagesStates(true);
+ request.setAttribute("languagesStates",
pageOnlyLanguagesStates=
);
+ }
+ =
Enumeration languageEnum =3D languageSettings.elements();
=
while (siteLangSettingsEnum.hasMoreElements()) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
