Merge branch 'i254-simple' into release-1.3

rundeck · Apr 27, 2011 · eb3db3b · eb3db3b
2 parents 59dd475 + 567a3e3
commit eb3db3b
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/rundeckapp/grails-app/views/menu/_groupTree.gsp b/rundeckapp/grails-app/views/menu/_groupTree.gsp
@@ -32,7 +32,8 @@
 <g:timerEnd key="gtx"/>
 <g:set var="prevkey" value="${null}"/>
 <g:set var="indent" value="${0}"/>
-<g:set var="divcount" value="${[]}"/>
+<g:set var="divcounts" value="${0}"/>
+<g:set var="level" value="${[]}"/>
 
 <g:each in="${gkeys}" var="group">
     <g:timerStart key="_groupTree2.gsp-loop"/>
@@ -42,18 +43,38 @@
     <g:if test="${prevkey && group.key.startsWith(prevkey+'/')}">
         %{
             indent++;
+            level<<group.key
         }%
         <g:set var="displaygroup" value="${group.key.substring(prevkey.length()+1)}"/>
     </g:if>
+    <g:elseif test="${level && level.findLastIndexOf {group.key.startsWith(it+'/')}>=0}">
+        <g:set var="found" value="${level.findLastIndexOf{group.key.startsWith(it+'/')}}"/>
+        <g:set var="count" value="${level.size()-(found+1)}"/>
+        <g:set var="displaygroup" value="${group.key.substring(level[found].length()+1)}"/>
+        <g:set var="outdiv" value=""/>
+        %{
+            indent-=count;
+            level = level[0..found];
+            level<<group.key;
+            outdiv= (['</div>'] * (count*2)).join('<!-- x -->');
+            divcounts-=(count*2);
+         }%
+        ${outdiv}
+
+    </g:elseif>
     <g:else>
-        ${divcount.join('<!--rend-->')}
+        ${(['</div>'] * divcounts).join('<!--rend-->')}
+        <g:set var="level" value="${[]}"/>
         <g:set var="indent" value="${0}"/>
-        <g:set var="divcount" value="${[]}"/>
+        <g:set var="divcounts" value="${0}"/>
+        %{
+            level<<group.key
+        }%
     </g:else>
     <g:set var="prevkey" value="${group.key}"/>
     <g:set var="groupopen" value="${(wasfiltered || jscallback)}"/>
     ${"<"}div class="expandComponentHolder ${groupopen ? 'expanded' : ''} " ${">"}
-        %{divcount<<'</div>'}%
+        %{divcounts++;}%
         <div style="margin-bottom:4px;">
         <g:if test="${jscallback}">
             <span class="expandComponentControl textbtn action groupname jobgroupexpand" onclick="${jscallback + '(\'' + (prefix ? prefix + '/' + group.key : group.key) + '\');return false;' }" title="${jscallback ? 'Select this group' : 'Expand/Collapse this group'}" style="padding-left:4px;"><%--
@@ -71,7 +92,7 @@
 
         <g:timerEnd key="prepare"/>
         ${"<"}div class="expandComponent sub_${currkey}_group sub_group" style="${wdgt.styleVisible(if: groupopen)}"${">"}
-        %{ divcount << '</div>' }%
+        %{ divcounts++;}%
         <g:if test="${jobgroups[group.key]}">
             <div class="jobGroups subjobs">
             <g:render template="jobslist" model="[jobslist:jobgroups[group.key],total:jobgroups[group.key]?.size(),nowrunning:nowrunning,nextExecutions:nextExecutions,jobauthorizations:jobauthorizations,authMap:authMap,nowrunningtotal:nowrunningtotal,max:max,offset:offset,paginateParams:paginateParams,sortEnabled:true,headers:false,wasfiltered:wasfiltered,small:small?true:false,jobsjscallback:jobsjscallback]"/>
@@ -80,7 +101,7 @@
 
     <g:timerEnd key="_groupTree2.gsp-loop"/>
 </g:each>
-    ${divcount.join('<!--rlast-->')}
+    ${(['</div>'] * divcounts).join('<!--rlast-->')}
 
     <g:if test="${currentJobs}">
         <g:timerStart key="_groupTree2.gsp-jobslist"/>