------------------------------------------------------------ revno: 21110 committer: Lars Helge Overland <larshe...@gmail.com> branch nick: dhis2 timestamp: Wed 2015-11-18 16:02:34 +0100 message: Add data set. Removed function for adding data set to current user's user roles. Too much magic. Can be an unintended security problem. Also no guarantee that current user has write access to its user roles, causing crash. modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml
-- 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-api/src/main/java/org/hisp/dhis/user/UserService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java 2015-11-08 16:46:08 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java 2015-11-18 15:02:34 +0000 @@ -366,8 +366,6 @@ */ int countDataSetUserAuthorityGroups( DataSet dataSet ); - void assignDataSetToUserRole( DataSet dataSet ); - /** * Returns the number of UserAuthorityGroups. * === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java 2015-11-08 16:46:08 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java 2015-11-18 15:02:34 +0000 @@ -496,24 +496,6 @@ } @Override - public void assignDataSetToUserRole( DataSet dataSet ) - { - User currentUser = currentUserService.getCurrentUser(); - - if ( !currentUserService.currentUserIsSuper() && currentUser != null ) - { - UserCredentials userCredentials = getUserCredentials( currentUser ); - - for ( UserAuthorityGroup userAuthorityGroup : userCredentials.getUserAuthorityGroups() ) - { - userAuthorityGroup.getDataSets().add( dataSet ); - - updateUserAuthorityGroup( userAuthorityGroup ); - } - } - } - - @Override public void canIssueFilter( Collection<UserAuthorityGroup> userRoles ) { User user = currentUserService.getCurrentUser(); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2015-11-18 06:20:27 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java 2015-11-18 15:02:34 +0000 @@ -43,7 +43,6 @@ import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.system.util.AttributeUtils; import org.hisp.dhis.user.UserGroupService; -import org.hisp.dhis.user.UserService; import java.util.HashSet; import java.util.List; @@ -87,13 +86,6 @@ this.categoryService = categoryService; } - private UserService userService; - - public void setUserService( UserService userService ) - { - this.userService = userService; - } - private UserGroupService userGroupService; public void setUserGroupService( UserGroupService userGroupService ) @@ -352,8 +344,6 @@ dataSetService.addDataSet( dataSet ); - userService.assignDataSetToUserRole( dataSet ); - return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2015-11-02 04:27:25 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2015-11-18 15:02:34 +0000 @@ -113,7 +113,6 @@ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" /> <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" /> <property name="categoryService" ref="org.hisp.dhis.dataelement.DataElementCategoryService" /> - <property name="userService" ref="org.hisp.dhis.user.UserService" /> <property name="userGroupService" ref="org.hisp.dhis.user.UserGroupService" /> <property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" /> <property name="legendService" ref="org.hisp.dhis.legend.LegendService" />
_______________________________________________ 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