Fix run again multivalue options for rundeck#346

gschueler · Apr 24, 2013 · 528dcb1 · 528dcb1
1 parent 48ebec2
commit 528dcb1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/rundeckapp/grails-app/views/framework/_optionValuesSelect.gsp b/rundeckapp/grails-app/views/framework/_optionValuesSelect.gsp
@@ -90,10 +90,10 @@
                         </div>
                         <g:if test="${selectedoptsmap && selectedoptsmap[optName] && selectedoptsmap[optName] instanceof String}">
                             %{
-                                selectedoptsmap[optName]= selectedoptsmap[optName].split(optionSelect.delimiter)
+                                selectedoptsmap[optName]= selectedoptsmap[optName].split(optionSelect.delimiter) as List
                                 }%
                         </g:if>
-                        <g:set var="newvals" value="${selectedoptsmap ?selectedoptsmap[optName].findAll {optionSelect.values && !optionSelect.values.contains(it)}:null}"/>
+                        <g:set var="newvals" value="${selectedoptsmap ? optionSelect.values?selectedoptsmap[optName].findAll { !optionSelect.values.contains(it) } : selectedoptsmap[optName] : null}"/>
                         <g:if test="${newvals}">
                             <g:javascript>
                                 fireWhenReady('${rkey.encodeAsJavaScript()}varinput', function(){
@@ -200,4 +200,4 @@
 </g:if>
 <g:elseif test="${values}">
     %{--<g:img file="icon-tiny-ok.png" title="Remote option values loaded from URL: ${srcUrl.encodeAsHTML()}"/>--}%
-</g:elseif>
+</g:elseif>