From d7b59bfc7d726e80d29e6c7ae5c2927744f727f3 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 13 Nov 2012 12:24:25 -0800
Subject: [PATCH] Fixed a regression introduced by pull request #606

---
 core/src/main/java/hudson/tasks/Maven.java          |  6 ++++++
 .../main/resources/hudson/tasks/Maven/config.jelly  | 13 ++++++++-----
 .../resources/hudson/tasks/Maven/help-settings.html |  0
 3 files changed, 14 insertions(+), 5 deletions(-)
 rename war/src/main/webapp/help/tasks/maven/maven-settings.html => core/src/main/resources/hudson/tasks/Maven/help-settings.html (100%)

diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index e3a247c4c7..de3ca368d7 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -394,6 +394,12 @@ public class Maven extends Builder {
             return "/help/project-config/maven.html";
         }
 
+        @Override
+        public String getHelpFile(String fieldName) {
+            if (fieldName.equals("globalSettings")) fieldName = "settings"; // same help file
+            return super.getHelpFile(fieldName);
+        }
+
         public String getDisplayName() {
             return Messages.Maven_DisplayName();
         }
diff --git a/core/src/main/resources/hudson/tasks/Maven/config.jelly b/core/src/main/resources/hudson/tasks/Maven/config.jelly
index d0e92aa9b0..f08e941d54 100644
--- a/core/src/main/resources/hudson/tasks/Maven/config.jelly
+++ b/core/src/main/resources/hudson/tasks/Maven/config.jelly
@@ -50,11 +50,14 @@ THE SOFTWARE.
     <f:entry field="usePrivateRepository" title="${%Use private Maven repository}" help="/plugin/maven-plugin/private-repository.html">
       <f:checkbox checked="${it.usesPrivateRepository()}" />
     </f:entry>
-    <f:entry title="${%Settings file}" field="settings" help="/help/tasks/maven/maven-settings.html">
-       <f:dropdownDescriptorSelector descriptors="${descriptor.settingsProviders}"/>
+    <f:dropdownDescriptorSelector title="${%Settings file}" descriptors="${descriptor.settingsProviders}" field="settings"/>
+<!--
+    <f:entry   help="/help/tasks/maven/maven-settings.html">
+
     </f:entry>
-    <f:entry title="${%Global Settings file}" field="globalSettings" help="/help/tasks/maven/maven-settings.html">
-       <f:dropdownDescriptorSelector descriptors="${descriptor.globalSettingsProviders}"/>
-    </f:entry>          
+    <f:entry   help="/help/tasks/maven/maven-settings.html">
+    </f:entry>
+-->
+    <f:dropdownDescriptorSelector title="${%Global Settings file}" field="globalSettings" descriptors="${descriptor.globalSettingsProviders}"/>
   </f:advanced>
 </j:jelly>
\ No newline at end of file
diff --git a/war/src/main/webapp/help/tasks/maven/maven-settings.html b/core/src/main/resources/hudson/tasks/Maven/help-settings.html
similarity index 100%
rename from war/src/main/webapp/help/tasks/maven/maven-settings.html
rename to core/src/main/resources/hudson/tasks/Maven/help-settings.html
-- 
GitLab