------------------------------------------------------------
revno: 17027
committer: jimgr...@gmail.com
branch nick: dhis2
timestamp: Thu 2014-10-09 16:46:49 -0400
message:
Temporary fix for exception while adding data sets to user roles.
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.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-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java 2014-10-09 20:46:49 +0000
@@ -126,7 +126,13 @@
for ( String id : selectedList )
{
- DataSet dataSet = dataSetService.getDataSet( Integer.parseInt( id ) );
+ DataSet dataSet = dataSetService.getDataSet( id );
+
+ if ( dataSet == null )
+ {
+ //TODO fix this better. Currently some are UID, some ID. Should all be the same.
+ dataSet = dataSetService.getDataSet( Integer.parseInt( id ) );
+ }
group.getDataSets().add( dataSet );
}
_______________________________________________
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
