[JENKINS-28094] Displays the help files of Copyartifact#getSelector f…

…or BuildSelectorParameter.
jenkinsci · May 3, 2015 · 4e5cd11 · 4e5cd11
1 parent f28c554
commit 4e5cd11
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/copyartifact/BuildSelectorParameter.java b/src/main/java/hudson/plugins/copyartifact/BuildSelectorParameter.java
@@ -111,6 +111,21 @@ public boolean apply(Descriptor<BuildSelector> input) {
                     }
             ));
         }
+
+        @Override
+        public String getHelpFile(String fieldName) {
+            if ("defaultSelector".equals(fieldName) || "parameter".equals(fieldName)) {
+                // Display the help file of `Copyartifact#getSelector` ("which build" field)
+                // for `defaultSelector` ("Default Selector" field) in project configuration pages
+                // and the value of build parameter ("Build selector for Copy Artifact" field)
+                // in "This build requires parameters" pages.
+                Descriptor<?> d = Jenkins.getInstance().getDescriptor(CopyArtifact.class);
+                if (d != null) {
+                    return d.getHelpFile("selector");
+                }
+            }
+            return super.getHelpFile(fieldName);
+        }
     }
 
     private static final XStream2 XSTREAM = new XStream2();

diff --git a/src/main/resources/hudson/plugins/copyartifact/BuildSelectorParameter/config.jelly b/src/main/resources/hudson/plugins/copyartifact/BuildSelectorParameter/config.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
   <f:entry title="${%Name}" field="name" help="/help/parameter/name.html">
     <f:textbox/>
   </f:entry>
-  <f:dropdownDescriptorSelector field="defaultSelector"  help="/plugin/copyartifact/help-buildSelector.html"
+  <f:dropdownDescriptorSelector field="defaultSelector"
       title="${%Default Selector}" descriptors="${descriptor.availableBuildSelectorList}" />
   <f:entry title="${%Description}" field="description" help="/help/parameter/description.html">
     <f:textarea/>

diff --git a/src/main/resources/hudson/plugins/copyartifact/BuildSelectorParameter/index.jelly b/src/main/resources/hudson/plugins/copyartifact/BuildSelectorParameter/index.jelly
@@ -23,12 +23,15 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
-  <f:dropdownDescriptorSelector field="parameter" help="/plugin/copyartifact/help-buildSelector.html"
+  <j:scope>
+  <j:set var="descriptor" value="${it.descriptor}" /> <!-- this enables displaying the help file. -->
+  <f:dropdownDescriptorSelector field="parameter"
       title="${it.name}" description="${it.description}"
       default="${it.defaultSelector}"
       descriptors="${it.descriptor.availableBuildSelectorList}">
     <j:if test="${dropdownListMode=='generateEntries'}">
       <tr><td><input type="hidden" name="name" value="${it.name}"/></td></tr>
     </j:if>
   </f:dropdownDescriptorSelector>
+  </j:scope>
 </j:jelly>