[FIXED JENKINS-37147] FIXED: "Top Most Value" is replaced with an emp…

…ty value when the page load is slow
jenkinsci · Sep 10, 2016 · 8c02e0d · 8c02e0d
1 parent a2f0d8b
commit 8c02e0d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 4 deletions.
diff --git a/.../ikedam/jenkins/plugins/extensible_choice_parameter/GlobalTextareaChoiceListProvider.java b/.../ikedam/jenkins/plugins/extensible_choice_parameter/GlobalTextareaChoiceListProvider.java
@@ -151,6 +151,15 @@ public ListBoxModel doFillDefaultChoiceItems(@QueryParameter String name)
             return ret;
         }
 
+
+        /**
+         * @return the special value used for "No default choice" (use the top most)
+         */
+        public String getNoDefaultChoice()
+        {
+            return NoDefaultChoice;
+        }
+
         /**
          * Retrieve the set of choices entry by the name.
          * 

diff --git a/...jp/ikedam/jenkins/plugins/extensible_choice_parameter/SystemGroovyChoiceListProvider.java b/...jp/ikedam/jenkins/plugins/extensible_choice_parameter/SystemGroovyChoiceListProvider.java
@@ -149,7 +149,15 @@ public ListBoxModel doFillDefaultChoiceItems(StaplerRequest req, @QueryParameter
 
             return ret;
         }
-
+
+        /**
+         * @return the special value used for "No default choice" (use the top most)
+         */
+        public String getNoDefaultChoice()
+        {
+            return NoDefaultChoice;
+        }
+
         public FormValidation doTest(StaplerRequest req, @QueryParameter String scriptText, @QueryParameter boolean usePredefinedVariables)
         {
             List<String> choices = null;

diff --git a/...ava/jp/ikedam/jenkins/plugins/extensible_choice_parameter/TextareaChoiceListProvider.java b/...ava/jp/ikedam/jenkins/plugins/extensible_choice_parameter/TextareaChoiceListProvider.java
@@ -93,6 +93,14 @@ public ListBoxModel doFillDefaultChoiceItems(@QueryParameter String choiceListTe
             }
             return ret;
         }
+
+        /**
+         * @return the special value used for "No default choice" (use the top most)
+         */
+        public String getNoDefaultChoice()
+        {
+            return NoDefaultChoice;
+        }
     }
 
     private List<String> choiceList = null;

diff --git a/...jenkins/plugins/extensible_choice_parameter/GlobalTextareaChoiceListProvider/config.jelly b/...jenkins/plugins/extensible_choice_parameter/GlobalTextareaChoiceListProvider/config.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
         <f:select />
     </f:entry>
     <f:entry title="${%Default Choice}" field="defaultChoice" help="/plugin/extensible-choice-parameter/help/defaultChoice.html">
-        <f:select />
+        <f:select default="${descriptor.noDefaultChoice}" />
     </f:entry>
     <m:addEditedValue />
 </j:jelly>
diff --git a/...m/jenkins/plugins/extensible_choice_parameter/SystemGroovyChoiceListProvider/config.jelly b/...m/jenkins/plugins/extensible_choice_parameter/SystemGroovyChoiceListProvider/config.jelly
@@ -36,6 +36,6 @@ THE SOFTWARE.
         with="scriptText,usePredefinedVariables"
     />
     <f:entry title="${%Default Choice}" field="defaultChoice" help="/plugin/extensible-choice-parameter/help/defaultChoice.html">
-        <f:select />
+        <f:select default="${descriptor.noDefaultChoice}" />
     </f:entry>
 </j:jelly>
diff --git a/...kedam/jenkins/plugins/extensible_choice_parameter/TextareaChoiceListProvider/config.jelly b/...kedam/jenkins/plugins/extensible_choice_parameter/TextareaChoiceListProvider/config.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
         <f:textarea />
     </f:entry>
     <f:entry title="${%Default Choice}" field="defaultChoice" help="/plugin/extensible-choice-parameter/help/defaultChoice.html">
-        <f:select />
+        <f:select default="${descriptor.noDefaultChoice}" />
     </f:entry>
     <m:addEditedValue />
 </j:jelly>