dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10735
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-05-02 13:16:27 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementOperandsAction.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.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-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementOperandsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementOperandsAction.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementOperandsAction.java	2013-05-02 11:16:27 +0000
@@ -48,6 +48,7 @@
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
+    
     private DataSetService dataSetService;
 
     public void setDataSetService( DataSetService dataSetService )

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java	2012-10-04 16:52:13 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java	2013-05-02 11:16:27 +0000
@@ -87,6 +87,13 @@
     {
         this.id = id;
     }
+    
+    private String uid;
+
+    public void setUid( String uid )
+    {
+        this.uid = uid;
+    }
 
     private String key;
 
@@ -150,6 +157,10 @@
         {
             dataElements = new ArrayList<DataElement>( dataElementService.getDataElementGroup( id ).getMembers() );
         }
+        else if ( uid != null )
+        {
+            dataElements = new ArrayList<DataElement>( dataElementService.getDataElementGroup( uid ).getMembers() );
+        }
         else if ( !StringUtils.isEmpty( key ) )
         {
             dataElements = new ArrayList<DataElement>( dataElementService.getDataElementsLikeName( key ) );