Merge pull request #34 from jglick/permalink-combobox-JENKINS-22590

[FIXED JENKINS-22590] Use a combobox, not a pulldown, for permalink selection
jenkinsci · May 11, 2014 · 4c6e978 · 4c6e978
2 parents 59d7982 + 15d52b1
commit 4c6e978
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/main/java/hudson/plugins/copyartifact/PermalinkBuildSelector.java b/src/main/java/hudson/plugins/copyartifact/PermalinkBuildSelector.java
@@ -30,8 +30,7 @@
 import hudson.model.Job;
 import hudson.model.PermalinkProjectAction.Permalink;
 import hudson.model.Run;
-import hudson.util.ListBoxModel;
+import hudson.util.ComboBoxModel;
-import hudson.util.ListBoxModel.Option;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.AncestorInPath;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -65,15 +64,14 @@ public String getDisplayName() {
             return Messages.PermalinkBuildSelector_DisplayName();
         }
 
-        public ListBoxModel doFillIdItems(@AncestorInPath Job defaultJob, @RelativePath("..") @QueryParameter("projectName") String projectName) {
+        public ComboBoxModel doFillIdItems(@AncestorInPath Job copyingJob, @RelativePath("..") @QueryParameter("projectName") String projectName) {
-            // gracefully fall back to some job, if none is given
             Job j = null;
-            if (projectName!=null)  j = Jenkins.getInstance().getItem(projectName,defaultJob,Job.class);
+            if (projectName != null) {
-            if (j==null)    j = defaultJob;
+                j = Jenkins.getInstance().getItem(projectName, copyingJob, Job.class);
-
+            }
-            ListBoxModel r = new ListBoxModel();
+            ComboBoxModel r = new ComboBoxModel();
-            for (Permalink p : j.getPermalinks()) {
+            for (Permalink p : j != null ? j.getPermalinks() : Permalink.BUILTIN) {
-                r.add(new Option(p.getDisplayName(),p.getId()));
+                r.add(p.getId());
             }
             return r;
         }

diff --git a/src/main/resources/hudson/plugins/copyartifact/PermalinkBuildSelector/config.jelly b/src/main/resources/hudson/plugins/copyartifact/PermalinkBuildSelector/config.jelly
@@ -24,6 +24,6 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
   <f:entry title="${%Permalink}" field="id">
-    <f:select />
+    <f:combobox/>
   </f:entry>
 </j:jelly>