------------------------------------------------------------
revno: 20555
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Wed 2015-10-07 14:03:31 +0700
message:
add missing @Scanned annotation for userAuthorityGroup.programs
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.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-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2015-10-05 07:55:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2015-10-07 07:03:31 +0000
@@ -79,6 +79,7 @@
@Scanned
private Set<DataSet> dataSets = new HashSet<>();
+ @Scanned
private Set<Program> programs = new HashSet<>();
// -------------------------------------------------------------------------
@@ -255,8 +256,7 @@
}
else if ( strategy.isMerge() )
{
- description = userAuthorityGroup.getDescription() == null ? description : userAuthorityGroup
- .getDescription();
+ description = userAuthorityGroup.getDescription() == null ? description : userAuthorityGroup.getDescription();
}
removeAllAuthorities();
_______________________________________________
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
