mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
Fixed a regression introduced by pull request #606
(cherry picked from commit d7b59bfc7d)
This commit is contained in:
1 parent
a3742920fd
commit
80fa3c6bbc
3 files changed
+14
-5
No files matched your search
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
Reference in new issue
Block a user