[JENKINS-29407] Double check before using instance! Check if the it v…

…ariable is available, or the configuration scripts can be emptied!
jenkinsci · Jul 22, 2015 · 2e53bed · 2e53bed
1 parent 00a8c29
commit 2e53bed
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/main/resources/org/biouno/unochoice/CascadeChoiceParameter/config.jelly b/src/main/resources/org/biouno/unochoice/CascadeChoiceParameter/config.jelly
@@ -5,7 +5,14 @@
     <f:textbox name="parameter.name" value="${instance.name}" />
   </f:entry>
   <f:entry title="${%Script}">
-    <f:hetero-radio field="script" descriptors="${descriptor.getApplicableResultSeekers(instance)}" />
+    <j:choose>
+      <j:when test="${null != it}">
+        <f:hetero-radio field="script" descriptors="${descriptor.getApplicableResultSeekers(it)}" />
+      </j:when>
+      <j:otherwise>
+        <f:hetero-radio field="script" descriptors="${descriptor.getApplicableResultSeekers(instance)}" />
+      </j:otherwise>
+    </j:choose>
   </f:entry>
   <f:entry title="${%Description}" field="description" help="/help/parameter/description.html">
     <f:textarea name="parameter.description" value="${instance.description}" />

diff --git a/src/main/resources/org/biouno/unochoice/ChoiceParameter/config.jelly b/src/main/resources/org/biouno/unochoice/ChoiceParameter/config.jelly
@@ -5,7 +5,14 @@
     <f:textbox name="parameter.name" value="${instance.name}" />
   </f:entry>
   <f:entry title="${%Script}">
-    <f:hetero-radio field="script" descriptors="${descriptor.getApplicableResultSeekers(instance)}" />
+    <j:choose>
+      <j:when test="${null != it}">
+        <f:hetero-radio field="script" descriptors="${descriptor.getApplicableResultSeekers(it)}" />
+      </j:when>
+      <j:otherwise>
+        <f:hetero-radio field="script" descriptors="${descriptor.getApplicableResultSeekers(instance)}" />
+      </j:otherwise>
+    </j:choose>
   </f:entry>
   <f:entry title="${%Description}" field="description" help="/help/parameter/description.html">
     <f:textarea name="parameter.description" value="${instance.description}" />

diff --git a/src/main/resources/org/biouno/unochoice/DynamicReferenceParameter/config.jelly b/src/main/resources/org/biouno/unochoice/DynamicReferenceParameter/config.jelly
@@ -5,7 +5,14 @@
     <f:textbox name="parameter.name" value="${instance.name}" />
   </f:entry>
   <f:entry title="${%Script}">
-    <f:hetero-radio field="script" descriptors="${descriptor.getApplicableResultSeekers(instance)}" />
+    <j:choose>
+      <j:when test="${null != it}">
+        <f:hetero-radio field="script" descriptors="${descriptor.getApplicableResultSeekers(it)}" />
+      </j:when>
+      <j:otherwise>
+        <f:hetero-radio field="script" descriptors="${descriptor.getApplicableResultSeekers(instance)}" />
+      </j:otherwise>
+    </j:choose>
   </f:entry>
   <f:entry title="${%Description}" field="description" help="/help/parameter/description.html">
     <f:textarea name="parameter.description" value="${instance.description}" />