dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #21578
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10243: Minor
------------------------------------------------------------
revno: 10243
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-03-15 09:41:06 +0100
message:
Minor
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.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-api/src/main/java/org/hisp/dhis/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2013-03-14 10:12:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2013-03-15 08:41:06 +0000
@@ -758,8 +758,12 @@
targetLineLabel = chart.getTargetLineLabel() == null ? targetLineLabel : chart.getTargetLineLabel();
baseLineValue = chart.getBaseLineValue() == null ? baseLineValue : chart.getBaseLineValue();
baseLineLabel = chart.getBaseLineLabel() == null ? baseLineLabel : chart.getBaseLineLabel();
+ userOrganisationUnit = chart.isUserOrganisationUnit();
+ userOrganisationUnitChildren = chart.isUserOrganisationUnitChildren();
+ showData = chart.isShowData();
+ rewindRelativePeriods = chart.isRewindRelativePeriods();
+
relatives = chart.getRelatives() == null ? relatives : chart.getRelatives();
- userOrganisationUnit = chart.isUserOrganisationUnit();
user = chart.getUser() == null ? user : chart.getUser();
organisationUnitGroupSet = chart.getOrganisationUnitGroupSet() == null ? organisationUnitGroupSet : chart.getOrganisationUnitGroupSet();