← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16299: get full operands in DataElementOperandController

 

------------------------------------------------------------
revno: 16299
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-08-04 11:23:19 +0700
message:
  get full operands in DataElementOperandController
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.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-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java	2014-06-18 11:17:33 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java	2014-08-04 04:23:19 +0000
@@ -48,7 +48,7 @@
  * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
  */
 @Controller
-@RequestMapping( value = DataElementOperandSchemaDescriptor.API_ENDPOINT )
+@RequestMapping(value = DataElementOperandSchemaDescriptor.API_ENDPOINT)
 public class DataElementOperandController extends AbstractCrudController<DataElementOperand>
 {
     @Autowired
@@ -57,7 +57,7 @@
     protected List<DataElementOperand> getEntityList( WebMetaData metaData, WebOptions options )
     {
         List<DataElement> dataElements = new ArrayList<>( manager.getAllSorted( DataElement.class ) );
-        List<DataElementOperand> entityList = new ArrayList<>( categoryService.getOperands( dataElements ) );
+        List<DataElementOperand> entityList = new ArrayList<>( categoryService.getFullOperands( dataElements ) );
 
         if ( options.hasPaging() )
         {