[JENKINS-42877] Fix icon not being displayed when it's a folder confi…

…guration.
jenkinsci · Mar 17, 2017 · a22f855 · a22f855
1 parent ee0e4dc
commit a22f855
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/configfiles/ConfigFilesManagement.java b/src/main/java/org/jenkinsci/plugins/configfiles/ConfigFilesManagement.java
@@ -82,7 +82,7 @@ public String getIconFileName() {
     }
 
     /**
-     * used by index.jelly to resolve the correct path to the icon (see JENKINS-24441)
+     * used by configfiles.jelly to resolve the correct path to the icon (see JENKINS-24441)
      */
     public String getIconUrl(String rootUrl) {
         if (rootUrl.endsWith("/")) {

diff --git a/src/main/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileAction.java b/src/main/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileAction.java
@@ -40,6 +40,16 @@ public String getIconFileName() {
         return ConfigFilesManagement.ICON_PATH;
     }
 
+    /**
+     * used by configfiles.jelly to resolve the correct path to the icon (see JENKINS-24441)
+     */
+    public String getIconUrl(String rootUrl) {
+        if (rootUrl.endsWith("/")) {
+            return rootUrl + ConfigFilesManagement.ICON_PATH.substring(1);
+        }
+        return rootUrl + ConfigFilesManagement.ICON_PATH;
+    }
+
     @Override
     public String getDisplayName() {
         return "Config Files";