dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17033
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-10-10 13:20:01 +0200
message:
  Data entry, minor
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.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-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java	2014-10-07 03:59:22 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java	2014-10-10 11:20:01 +0000
@@ -257,9 +257,9 @@
         {
             dataSets = new ArrayList<>( dataSetService.getAllDataSets() );
         }
-        else
+        else if ( user != null )
         {
-            dataSets = new ArrayList<>( currentUserService.getCurrentUser().getUserCredentials().getAllDataSets() );
+            dataSets = new ArrayList<>( user.getUserCredentials().getAllDataSets() );
         }
 
         Set<DataElementCategoryCombo> categoryComboSet = new HashSet<>();