dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #35353
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18127: Sharing, required false for page size
------------------------------------------------------------
revno: 18127
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-01-27 07:46:32 -0500
message:
Sharing, required false for page size
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.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/SharingController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java 2015-01-27 12:46:32 +0000
@@ -258,7 +258,7 @@
}
@RequestMapping( value = "/search", method = RequestMethod.GET, produces = { "application/json" } )
- public void searchUserGroups( @RequestParam String key, @RequestParam Integer pageSize, HttpServletResponse response ) throws IOException
+ public void searchUserGroups( @RequestParam String key, @RequestParam( required = false ) Integer pageSize, HttpServletResponse response ) throws IOException
{
if ( key == null )
{
@@ -272,7 +272,7 @@
List<UserGroup> userGroups = userGroupService.getUserGroupsBetweenByName( key, 0, max );
- for ( UserGroup userGroup : userGroups )
+ for ( UserGroup userGroup : userGroups )
{
SharingUserGroupAccess sharingUserGroupAccess = new SharingUserGroupAccess();