svn commit: [jahia] r19338 - /branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/views/engines/versioning/pages/revisions-list.jsp

[sshyrkov]

Author: sshyrkov
Date: Tue Dec  4 12:27:48 2007
New Revision: 19338

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19338&repname=
=3Djahia
Log:
[trunk r19336] JAHIA-2527: 30'000 pages DB: perf issue with versioning engi=
ne (10 level diffs selection)

* limit to maximum 3 selectable levels

Modified:
    branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/views/engines/version=
ing/pages/revisions-list.jsp

Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/views/engines/v=
ersioning/pages/revisions-list.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/webapp/views/engines/versioning/pages/revisions-list.=
jsp&rev=3D19338&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-INCLUDE-TAG-BRANCH/core/src/webapp/views/engines/version=
ing/pages/revisions-list.jsp (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/views/engines/version=
ing/pages/revisions-list.jsp Tue Dec  4 12:27:48 2007
@@ -173,51 +173,20 @@
             <b><jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.version.showRevisionsFor"/>&nbsp;:&nbsp;</b>
             <br/>&nbsp;<br/>
             - <select class=3D"input" name=3D"level" onChange=3D"sendForm(=
'showRevisionsList','');">
-            <option value=3D"-1"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"-1">
-                    selected</logic:equal> ><jahia:engineResourceBundle
-                    resourceName=3D"org.jahia.engines.version.allDescendin=
gPages"/>
-            <option value=3D"1"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"1">
-                    selected</logic:equal> >1&nbsp;&nbsp;<jahia:engineReso=
urceBundle
-                    resourceName=3D"org.jahia.engines.version.level"/> (<j=
ahia:engineResourceBundle
-                    resourceName=3D"org.jahia.engines.version.currentPageO=
nly"/>)
-            <option value=3D"2"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"2">
-                    selected</logic:equal> >2&nbsp;&nbsp;<jahia:engineReso=
urceBundle
-                    resourceName=3D"org.jahia.engines.version.levels"/>
-            <option value=3D"3"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"3">
-                    selected</logic:equal> >3&nbsp;&nbsp;<jahia:engineReso=
urceBundle
-                    resourceName=3D"org.jahia.engines.version.levels"/>
-            <option value=3D"4"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"4">
-                    selected</logic:equal> >4&nbsp;&nbsp;<jahia:engineReso=
urceBundle
-                    resourceName=3D"org.jahia.engines.version.levels"/>
-            <option value=3D"5"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"5">
-                    selected</logic:equal> >5&nbsp;&nbsp;<jahia:engineReso=
urceBundle
-                    resourceName=3D"org.jahia.engines.version.levels"/>
-            <option value=3D"6"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"6">
-                    selected</logic:equal> >6&nbsp;&nbsp;<jahia:engineReso=
urceBundle
-                    resourceName=3D"org.jahia.engines.version.levels"/>
-            <option value=3D"7"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"7">
-                    selected</logic:equal> >7&nbsp;&nbsp;<jahia:engineReso=
urceBundle
-                    resourceName=3D"org.jahia.engines.version.levels"/>
-            <option value=3D"8"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"8">
-                    selected</logic:equal> >8&nbsp;&nbsp;<jahia:engineReso=
urceBundle
-                    resourceName=3D"org.jahia.engines.version.levels"/>
-            <option value=3D"9"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"9">
-                    selected</logic:equal> >9&nbsp;&nbsp;<jahia:engineReso=
urceBundle
-                    resourceName=3D"org.jahia.engines.version.levels"/>
-            <option value=3D"10"
-            <logic:equal name=3D"jahiaEngineViewHelper" property=3D"pageLe=
velAsStr" value=3D"10">
-                    selected</logic:equal> >10&nbsp;<jahia:engineResourceB=
undle
-                    resourceName=3D"org.jahia.engines.version.levels"/>
+            <c:forEach var=3D"level" begin=3D"1" end=3D"3">               =
     =

+            <option value=3D"${level}"
+            <c:if test=3D"${jahiaEngineViewHelper.pageLevelAsStr =3D=3D le=
vel}">selected</c:if> >
+              ${level}&nbsp;&nbsp;
+              <c:choose>
+                <c:when test=3D"${level =3D=3D 1}">
+                  <jahia:engineResourceBundle resourceName=3D"org.jahia.en=
gines.version.level"/> (<jahia:engineResourceBundle
+                        resourceName=3D"org.jahia.engines.version.currentP=
ageOnly"/>)
+                </c:when>
+                <c:otherwise>
+                  <jahia:engineResourceBundle resourceName=3D"org.jahia.en=
gines.version.levels"/>
+                </c:otherwise>
+              </c:choose>          =

+            </c:forEach>        =

         </select>
         </td>
     </tr>

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list