Merge pull request #48 from realestate-com-au/development

Overide node filter when running a job
rundeck · Sep 28, 2011 · d11bf5e · d11bf5e
2 parents 35dd90c + a09e53b
commit d11bf5e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy
@@ -2499,6 +2499,9 @@ class ScheduledExecutionController  {
                 //error
                 model.nodesetempty=true
             }
+            else {
+                model.nodes=nodes
+            }
             //check nodeset filters for variable expansion
             def varfound=NodeSet.FILTER_ENUM.find{filter->
                 (nset.include?filter.value(nset.include)?.contains("\${"):false)||(nset.exclude?filter.value(nset.exclude)?.contains("\${"):false)

diff --git a/rundeckapp/grails-app/views/scheduledExecution/_execOptionsForm.gsp b/rundeckapp/grails-app/views/scheduledExecution/_execOptionsForm.gsp
@@ -12,6 +12,7 @@
 <div class="pageBody form">
     <g:form controller="scheduledExecution" method="post">
         <g:render template="editOptions" model="${[scheduledExecution:scheduledExecution, selectedoptsmap:selectedoptsmap, selectedargstring:selectedargstring,authorized:authorized,jobexecOptionErrors:jobexecOptionErrors]}"/>
+        <input name="extra._replaceNodeFilters" value="true" type="hidden"/>
 
         <g:if test="${nodesetvariables }">
             <div class="message note">
@@ -23,6 +24,17 @@
                 <g:message code="scheduledExecution.nodeset.empty.warning"/>
             </div>
         </g:elseif>
+        <g:elseif test="${nodes}">
+            <span class="prompt">Nodes:</span>
+            <div class="presentation">
+                <g:each var="node" in="${nodes}">
+                    <p>
+                    <input id="${node.nodename}" type="checkbox" name="extra.nodeIncludeName" value="${node.nodename}" checked="true"/>
+                    <label for="${node.nodename}">${node.nodename}</label>
+                    </p>
+                </g:each>
+            </div>
+        </g:elseif>
         <div class="buttons" id="formbuttons">
 
             <g:actionSubmit id="execFormCancelButton" value="Cancel"/>