dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17531
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-11-19 12:16:04 +0100
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java
  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/GetDataSetAssociationsAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java	2014-11-17 22:18:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java	2014-11-19 11:16:04 +0000
@@ -89,7 +89,8 @@
     @Override
     public String execute()
     {
-        Date lastUpdated = DateUtils.max( identifiableObjectManager.getLastUpdated( DataSet.class ), 
+        Date lastUpdated = DateUtils.max( 
+            identifiableObjectManager.getLastUpdated( DataSet.class ), 
             identifiableObjectManager.getLastUpdated( OrganisationUnit.class ) );
         String tag = lastUpdated != null ? DateUtils.LONG_DATE_FORMAT.format( lastUpdated ) : null;
         

=== 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-11-17 17:24:22 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java	2014-11-19 11:16:04 +0000
@@ -150,20 +150,6 @@
         return dataSets;
     }
 
-    private List<Set<String>> dataSetAssociationSets;
-
-    public List<Set<String>> getDataSetAssociationSets()
-    {
-        return dataSetAssociationSets;
-    }
-
-    private Map<String, Integer> organisationUnitAssociationSetMap;
-
-    public Map<String, Integer> getOrganisationUnitAssociationSetMap()
-    {
-        return organisationUnitAssociationSetMap;
-    }
-
     private boolean emptyOrganisationUnits;
 
     public boolean isEmptyOrganisationUnits()
@@ -206,6 +192,8 @@
     @Override
     public String execute()
     {
+        //TODO 403
+        
         User user = currentUserService.getCurrentUser();
 
         if ( user != null && user.getOrganisationUnits().isEmpty() )