dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18754
committer: Mark Polak <markpo@xxxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-03-30 17:28:47 +0200
message:
  Windows server friendly app paths
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/Module.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/Module.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/Module.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/Module.java	2015-03-30 15:28:47 +0000
@@ -86,8 +86,8 @@
         
         String defaultAction = app.getLaunchUrl();
 
-        String icon = hasIcon ? icon = app.getBaseUrl() + File.separator + app.getFolderName() +
-            File.separator + app.getIcons().getIcon48() : null;
+        String icon = hasIcon ? icon = app.getBaseUrl() + "/" + app.getFolderName() +
+            "/" + app.getIcons().getIcon48() : null;
 
         String description = TextUtils.subString( app.getDescription(), 0, 80 );
         
@@ -100,7 +100,7 @@
     
     public String getIconFallback()
     {
-        return icon != null ? icon : ".." + File.separator + "icons" + File.separator + name + ".png";
+        return icon != null ? icon : "../icons/" + name + ".png";
     }
     
     // -------------------------------------------------------------------------