dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18160
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-02-03 14:14:56 +0100
message:
  Minor
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2015-02-03 13:14:56 +0000
@@ -1084,6 +1084,10 @@
                 orgUnits.addAll( organisationUnitService.getOrganisationUnits( groups, ousList ) );
             }
 
+            // -----------------------------------------------------------------
+            // When levels / groups are present, OUs are considered boundaries
+            // -----------------------------------------------------------------
+
             if ( levels.isEmpty() && groups.isEmpty() )
             {
                 orgUnits.addAll( ous );

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java	2015-01-27 13:45:40 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java	2015-02-03 13:14:56 +0000
@@ -117,10 +117,10 @@
         programService.addProgram( program );
 
         stageA = new ProgramStage( "A", program );
-        int psIdA = programStageService.saveProgramStage( stageA );
+        programStageService.saveProgramStage( stageA );
 
         stageB = new ProgramStage( "B", program );
-        int psIdB = programStageService.saveProgramStage( stageB );
+        programStageService.saveProgramStage( stageB );
 
         Set<ProgramStage> programStages = new HashSet<>();
         programStages.add( stageA );
@@ -131,8 +131,8 @@
         DataElement dataElementA = createDataElement( 'A' );
         DataElement dataElementB = createDataElement( 'B' );
 
-        int deIdA = dataElementService.addDataElement( dataElementA );
-        int deIdB = dataElementService.addDataElement( dataElementB );
+        dataElementService.addDataElement( dataElementA );
+        dataElementService.addDataElement( dataElementB );
 
         stageDataElementA = new ProgramStageDataElement( stageA, dataElementA, false, 1 );
         ProgramStageDataElement stageDataElementB = new ProgramStageDataElement( stageA, dataElementB, false, 2 );