------------------------------------------------------------ revno: 11731 committer: Morten Olav Hansen <morte...@gmail.com> branch nick: dhis2 timestamp: Wed 2013-08-21 13:44:03 +0200 message: minor fixes to html5 mobile app. also removed /api/currentUser/forms, /api/currentUser/assignedDataSets should be used from now on modified: dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/layout.vm dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.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
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java 2013-08-21 10:15:05 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java 2013-08-21 11:44:03 +0000 @@ -361,7 +361,7 @@ } @SuppressWarnings( "unchecked" ) - @RequestMapping( value = { "/forms", "/assignedDataSets" }, produces = { "application/json", "text/*" } ) + @RequestMapping( value = "/assignedDataSets", produces = { "application/json", "text/*" } ) public void getDataSets( HttpServletResponse response, @RequestParam Map<String, String> parameters ) throws IOException, NotAuthenticatedException { User currentUser = currentUserService.getCurrentUser(); === modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache' --- dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache 2013-05-31 11:16:36 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache 2013-08-21 11:44:03 +0000 @@ -1,5 +1,5 @@ CACHE MANIFEST -# 2.13-SNAPSHOT V1 +# 2.13-SNAPSHOT V2 CACHE: ../mobile/index @@ -19,7 +19,6 @@ ../dhis-web-commons/css/light_blue/logo_banner.png ../dhis-web-mobile-resources/css/jquery.mobile.min.css ../dhis-web-mobile-resources/css/images/ajax-loader.gif -../dhis-web-mobile-resources/css/images/ajax-loader.png ../dhis-web-mobile-resources/css/images/icons-18-white.png ../dhis-web-mobile-resources/css/images/icons-18-black.png ../dhis-web-mobile-resources/css/images/icons-36-white.png === modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/layout.vm' --- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/layout.vm 2013-02-03 08:35:03 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/layout.vm 2013-08-21 11:44:03 +0000 @@ -7,13 +7,13 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <meta charset="UTF-8"> - <link rel="stylesheet" href="$contextPath/dhis-web-mobile-resources/css/jquery.mobile.min.css?v=1.2.0" /> + <link rel="stylesheet" href="$contextPath/dhis-web-mobile-resources/css/jquery.mobile.min.css" /> - <script src="$contextPath/dhis-web-commons/javascripts/jQuery/jquery.min.js?v=1.8.2"></script> + <script src="$contextPath/dhis-web-commons/javascripts/jQuery/jquery.min.js"></script> <script src="$contextPath/dhis-web-commons/javascripts/dhis2/dhis2.util.js"></script> <script src="$contextPath/dhis-web-commons/javascripts/dhis2/dhis2.array.js"></script> - <script src="$contextPath/dhis-web-commons/javascripts/underscore.min.js?v=1.4.3"></script> - <script src="$contextPath/dhis-web-mobile-resources/js/jquery.mobile.min.js?v=1.2.0"></script> + <script src="$contextPath/dhis-web-commons/javascripts/underscore.min.js"></script> + <script src="$contextPath/dhis-web-mobile-resources/js/jquery.mobile.min.js"></script> <script src="$contextPath/dhis-web-mobile-resources/js/dhis2.storage.js"></script> <script> === modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.js' --- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.js 2013-01-09 09:53:32 +0000 +++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.js 2013-08-21 11:44:03 +0000 @@ -36,7 +36,7 @@ dhis2.storage.FormManager.prototype.getMetaData = function () { return $.ajax({ - url : '../api/currentUser/forms', + url : '../api/currentUser/assignedDataSets', dataType : 'json', cache : false }).success(function ( data ) {
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp