=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserRoleController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserRoleController.java 2014-04-06 12:57:58 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserRoleController.java 2014-04-06 13:11:26 +0000 @@ -29,10 +29,16 @@ */ import org.hisp.dhis.api.controller.AbstractCrudController; +import org.hisp.dhis.api.controller.WebMetaData; +import org.hisp.dhis.api.controller.WebOptions; import org.hisp.dhis.user.UserAuthorityGroup; +import org.hisp.dhis.user.UserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.List; + /** * @author Morten Olav Hansen */ @@ -42,4 +48,16 @@ extends AbstractCrudController { public static final String RESOURCE_PATH = "/userRoles"; + + @Autowired + private UserService userService; + + @Override + protected List getEntityList( WebMetaData metaData, WebOptions options ) + { + List entityList = super.getEntityList( metaData, options ); + userService.canIssueFilter( entityList ); + + return entityList; + } }