dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12878
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-11-04 21:56:04 +0100
message:
  App manager, removed unused file
removed:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/ajax/
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/ajax/jsonSystemAuthorities.vm
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/uploadApp.js


--
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

=== removed directory 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/ajax'
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/ajax/jsonSystemAuthorities.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/ajax/jsonSystemAuthorities.vm	2013-05-23 00:18:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/ajax/jsonSystemAuthorities.vm	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#set( $size = $systemAuthorities.size() )
-{ "systemAuthorities": [
-#foreach( $systemAuthority in $systemAuthorities )
-  {
-  	#set( $name = $i18n.getString( "${systemAuthority}") )
-
-  	"id": "$!encoder.jsonEncode( ${systemAuthority} )",
-    "name": "$!encoder.jsonEncode( $name )"
-  }#if( $velocityCount < $size ),#end
-#end
-]
-#if( $usePaging ),
-	"paging":#parse( "/dhis-web-commons/ajax/jsonPaging.vm" )
-#end
-}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/uploadApp.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/uploadApp.js	2013-10-14 15:10:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/uploadApp.js	2013-11-04 20:56:04 +0000
@@ -23,8 +23,9 @@
                 }, 4000);
                 setHeaderDelayMessage(JSON.parse(xhr.responseText).message);
                 jQuery("#uploadPackageForm")[0].reset();
-                
-                window.location.reload();
+
+                setInterval( function() {
+                	window.location.reload() }, 1500 );
             }
         };
         xhr.open('post', 'addApp.action', true);