dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12258
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-09-26 17:20:53 +0200
message:
  App manager, moved logic out of getters
modified:
  dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppListAction.java
  dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java
  dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppStoreAction.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-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppListAction.java'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppListAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppListAction.java	2013-09-26 15:20:53 +0000
@@ -58,7 +58,7 @@
 
     public List<App> getAppList()
     {
-        return appManagerService.getInstalledApps();
+        return appList;
     }
 
     private List<String> appFolderNames = new ArrayList<String>();
@@ -68,13 +68,14 @@
         return appFolderNames;
     }
 
-    //TODO: create settings to set for external server like Apache2/nginx
-    // Should be a per-app setting
-    private String appsRootUrl = new String();
+    //TODO create settings to set for external server like Apache2/nginx
+    //TODO Should be a per-app setting
+    
+    private String appsRootUrl;
 
     public String getAppsRootUrl()
     {
-        return appManagerService.getAppBaseUrl();
+        return appsRootUrl;
     }
 
     // -------------------------------------------------------------------------
@@ -85,6 +86,10 @@
     public String execute()
         throws Exception
     {
+        appList = appManagerService.getInstalledApps();
+        
+        appsRootUrl = appManagerService.getAppBaseUrl();
+        
         for ( App app : getAppList() )
         {
             appFolderNames.add( appManagerService.getAppFolderName( app ) );

=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java	2013-09-03 15:24:51 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java	2013-09-26 15:20:53 +0000
@@ -78,6 +78,7 @@
             {
                 appFolderPath = realPath + File.separatorChar + "apps";
             }
+            
             appManagerService.setAppFolderPath( appFolderPath );
         }
 

=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppStoreAction.java'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppStoreAction.java	2013-08-30 07:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppStoreAction.java	2013-09-26 15:20:53 +0000
@@ -54,7 +54,7 @@
 
     public String getAppStoreUrl()
     {
-        return appManagerService.getAppStoreUrl();
+        return appStoreUrl;
     }
 
     // -------------------------------------------------------------------------
@@ -65,6 +65,8 @@
     public String execute()
         throws Exception
     {
+        appStoreUrl = appManagerService.getAppStoreUrl();
+        
         return SUCCESS;
     }
 }
\ No newline at end of file