------------------------------------------------------------ revno: 21513 committer: Lars Helge Overland <larshe...@gmail.com> branch nick: dhis2 timestamp: Tue 2015-12-22 14:13:27 +0100 message: Minor modified: dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppStoreController.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-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java 2015-12-22 12:43:17 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java 2015-12-22 13:13:27 +0000 @@ -89,7 +89,8 @@ // ------------------------------------------------------------------------- @RequestMapping( method = RequestMethod.GET, produces = ContextUtils.CONTENT_TYPE_JSON ) - public void getApps( @RequestParam( required = false ) String key, HttpServletResponse response ) + public void getApps( @RequestParam( required = false ) String key, + HttpServletResponse response ) throws IOException { List<App> apps = new ArrayList<>(); @@ -141,7 +142,8 @@ } @RequestMapping( value = "/{app}/**", method = RequestMethod.GET ) - public void renderApp( @PathVariable( "app" ) String app, HttpServletRequest request, HttpServletResponse response ) + public void renderApp( @PathVariable( "app" ) String app, + HttpServletRequest request, HttpServletResponse response ) throws IOException { Iterable<Resource> locations = Lists.newArrayList( @@ -209,7 +211,7 @@ @RequestMapping( value = "/{app}", method = RequestMethod.DELETE ) @PreAuthorize( "hasRole('ALL') or hasRole('M_dhis-web-maintenance-appmanager')" ) public void deleteApp( @PathVariable( "app" ) String app, - @RequestParam( value = "deleteappdata", required = false, defaultValue = "false" ) boolean deleteAppData, + @RequestParam( required = false ) boolean deleteAppData, HttpServletRequest request, HttpServletResponse response ) throws WebMessageException { === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppStoreController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppStoreController.java 2015-12-22 12:49:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppStoreController.java 2015-12-22 13:13:27 +0000 @@ -70,5 +70,5 @@ public void installAppFromAppStore( @PathVariable String versionId ) { appStoreManager.installAppFromAppStore( versionId ); - } + } }
_______________________________________________ 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