Fix node filter parameters for some api endpoints

rundeck · Jun 3, 2011 · 1586d3c · 1586d3c
1 parent 2ec51f5
commit 1586d3c
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy
@@ -2850,9 +2850,14 @@ class ScheduledExecutionController  {
         //convert api parameters to node filter parameters
         def filters = FrameworkController.extractApiNodeFilterParams(params)
         if (filters) {
+            inparams.extra['_replaceNodeFilters']='true'
+            inparams.extra['doNodedispatch']=true
             filters.each {k, v ->
                 inparams.extra[k] = v
             }
+            if(null==inparams.extra['nodeExcludePrecedence']){
+                inparams.extra['nodeExcludePrecedence'] = true
+            }
         }
 
         def result = executeScheduledExecution(scheduledExecution, framework, rolelist, inparams)
@@ -2932,9 +2937,13 @@ class ScheduledExecutionController  {
         //convert api parameters to node filter parameters
         def filters=FrameworkController.extractApiNodeFilterParams(params)
         if(filters){
+            filters['doNodedispatch']=true
             filters.each{k,v->
                 params[k]=v
             }
+            if (null == params['nodeExcludePrecedence']) {
+                params['nodeExcludePrecedence'] = true
+            }
         }
 
         def results=runAdhoc()
@@ -3000,9 +3009,13 @@ class ScheduledExecutionController  {
         //convert api parameters to node filter parameters
         def filters=FrameworkController.extractApiNodeFilterParams(params)
         if(filters){
+            filters['doNodedispatch'] = true
             filters.each{k,v->
                 params[k]=v
             }
+            if (null == params['nodeExcludePrecedence']) {
+                params['nodeExcludePrecedence'] = true
+            }
         }
 
         def results=runAdhoc()