Merge pull request #285 from pwm-project/ng-helpdesk

Fixed broken stylesheet URLs

server/src/main/java/password/pwm/http/tag/PwmScriptRefTag.java

@@ -22,7 +22,6 @@
 
 package password.pwm.http.tag;
 
-import password.pwm.PwmConstants;
 import password.pwm.http.JspUtility;
 import password.pwm.http.PwmRequest;
 import password.pwm.http.tag.url.PwmUrlTag;
@@ -56,7 +55,7 @@ public class PwmScriptRefTag extends TagSupport
             final String cspNonce = pwmRequest.getCspNonce();
 
             String url = getUrl();
-            url = convertUrl( url );
+            url = PwmUrlTag.convertUrl( url );
             url = PwmUrlTag.insertContext( pageContext, url );
             url = PwmUrlTag.insertResourceNonce( pwmRequest.getPwmApplication(), url );
 
@@ -70,14 +69,4 @@ public class PwmScriptRefTag extends TagSupport
         return EVAL_PAGE;
     }
 
-    private String convertUrl( final String input )
-    {
-        final String pwmClientUrl = "/resources/webjars/pwm-client/";
-        if ( input.contains( pwmClientUrl ) )
-        {
-            final String correctedUrl = "/resources/webjars/" + PwmConstants.PWM_APP_NAME.toLowerCase() + "-client/";
-            return input.replace( pwmClientUrl, correctedUrl );
-        }
-        return input;
-    }
 }

server/src/main/java/password/pwm/http/tag/url/PwmUrlTag.java

@@ -24,6 +24,7 @@ package password.pwm.http.tag.url;
 
 import password.pwm.AppProperty;
 import password.pwm.PwmApplication;
+import password.pwm.PwmConstants;
 import password.pwm.bean.LocalSessionStateBean;
 import password.pwm.config.PwmSetting;
 import password.pwm.error.PwmException;
@@ -59,6 +60,8 @@ public class PwmUrlTag extends PwmAbstractTag
     public int doEndTag( )
             throws javax.servlet.jsp.JspTagException
     {
+        final String url = convertUrl( this.url );
+
         String outputURL = url;
         PwmRequest pwmRequest = null;
         try
@@ -204,4 +207,14 @@ public class PwmUrlTag extends PwmAbstractTag
         return themeURL;
     }
 
+    public static String convertUrl( final String input )
+    {
+        final String pwmClientUrl = "/resources/webjars/pwm-client/";
+        if ( input.contains( pwmClientUrl ) )
+        {
+            final String correctedUrl = "/resources/webjars/" + PwmConstants.PWM_APP_NAME.toLowerCase() + "-client/";
+            return input.replace( pwmClientUrl, correctedUrl );
+        }
+        return input;
+    }
 }