Update node filter behavior [#190]

rundeck · Feb 18, 2011 · 2ef965f · 2ef965f
2 parents b6c32f4 + 10473d6
commit 2ef965f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/rundeckapp/grails-app/controllers/FrameworkController.groovy b/rundeckapp/grails-app/controllers/FrameworkController.groovy
@@ -73,7 +73,11 @@ class FrameworkController  {
         }
         Framework framework = frameworkService.getFrameworkFromUserSession(session,request)
         if(query.nodeFilterIsEmpty()){
-            query.nodeIncludeName = framework.getFrameworkNodeName()
+            if(params.formInput=='true'){
+                query.nodeIncludeName = '.*'
+            }else{
+                query.nodeIncludeName = framework.getFrameworkNodeName()
+            }
         }
         FrameworkController.autosetSessionProject(session,framework)
         if(query && !query.project && session.project){

diff --git a/rundeckapp/grails-app/views/framework/_nodeFilterField.gsp b/rundeckapp/grails-app/views/framework/_nodeFilterField.gsp
@@ -21,7 +21,7 @@
     Created: Oct 27, 2010 5:04:24 PM
  --%>
 <g:set var="type" value="${include?'Include':'Exclude'}"/>
-<div id="nodeFilter${type}${key}"  style="${query?.('node'+type+key)?'':'display:none;'}">
+<div id="nodeFilter${type}${key}"  style="${query?.('node'+type+key)?'':'display:none;'}" class="nfilteritem">
 <span class="input">
     ${NODE_FILTER_MAP[key]?NODE_FILTER_MAP[key]:key}:
     <input type='text' name="node${type}${key}"

diff --git a/rundeckapp/grails-app/views/framework/_nodeFiltersHidden.gsp b/rundeckapp/grails-app/views/framework/_nodeFiltersHidden.gsp
@@ -28,11 +28,11 @@
 <g:each var="key" in="${NODE_FILTERS}">
     <g:if test="${query?.('nodeInclude'+key)}">
         <input type='hidden' name="nodeInclude${key}"
-            value="${query?.('nodeInclude'+key)?.encodeAsHTML()}" id="schedJobNodeInclude${key}" />
+            value="${query?.('nodeInclude'+key)?.encodeAsHTML()}" />
     </g:if>
     <g:if test="${query?.('nodeExclude'+key)}">
             <input type='hidden' name="nodeExclude${key}"
-                value="${query?.('nodeExclude'+key)?.encodeAsHTML()}" id="schedJobNodeExclude${key}"/>
+                value="${query?.('nodeExclude'+key)?.encodeAsHTML()}" />
     </g:if>
 </g:each>
-<input type="hidden" name="nodeExcludePrecedence" value="${query?.nodeExcludePrecedence}" id="nodeExcludePrecedenceFalse"/>
+<input type="hidden" name="nodeExcludePrecedence" value="${query?.nodeExcludePrecedence}" />
diff --git a/rundeckapp/grails-app/views/framework/nodes.gsp b/rundeckapp/grails-app/views/framework/nodes.gsp
@@ -24,6 +24,17 @@
             }
         };
 
+        //method called by _nodeFilterInputs
+        function _matchNodes(){
+
+        }
+        function _clearNodeFilters(){
+            $$('.nfilteritem').each(Element.hide);
+            $$('.filterAdd').each(Element.show);
+            $$('.nfilteritem input').each(function(e){e.value='';});
+            return false;
+        }
+
         /*********
          *  remote editor
          *********/
@@ -666,13 +677,12 @@
                     <table class="simpleForm">
                         <g:render template="nodeFilterInputs" model="${[params:params,query:query]}"/>
                     </table>
-
                     <div>
 
                         <div class=" " style="text-align:right;">
                             <g:submitButton  name="Filter" />
 
-                            <g:submitButton name="Clear" />
+                            <g:submitButton name="Clear" onclick="return _clearNodeFilters();"/>
                         </div>
                     </div>
                 </div>
@@ -688,7 +698,7 @@
                 </g:ifUserInAnyRoles>
                 <g:if test="${!params.nofilters}">
                 <div style="margin: 10px 0 5px 0;" id="${rkey}nodesfilterholder" >
-                    <g:if test="${wasfiltered}">
+                    %{--<g:if test="${wasfiltered}">--}%
 
 
                         <div style="margin:5px 0; padding:5px 0;">
@@ -710,7 +720,7 @@
                         </g:if>
                         </div>
 
-                    </g:if>
+                    %{--</g:if>--}%
                     %{--<g:else>
                         <span class="prompt action" onclick="['${rkey}filter','${rkey}filterdispbtn','runbox'].each(Element.toggle);if(${isCompact}){$('${rkey}nodescontent').toggle();}" id="${rkey}filterdispbtn"  style="${!filtersOpen?'':'display:none;'}">
                             Filter