dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18468
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7795: Minor
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 7795 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-07-31 21:50:03 +0200
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
--
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-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2012-07-31 19:39:45 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2012-07-31 19:48:14 +0000
@@ -1676,7 +1676,8 @@
DV.c.dataelement.records = DV.util.dimension.dataelement.getRecords();
DV.c.dataset.records = DV.util.dimension.dataset.getRecords();
DV.c.relativeperiod.rp = DV.util.dimension.relativeperiod.getRelativePeriodObject();
- DV.c.relativeperiod.rewind = DV.cmp.dimension.relativeperiod.rewind.getValue();
+ DV.c.relativeperiod.rewind = DV.cmp.dimension.relativeperiod.rewind.isDisabled() ?
+ false : DV.cmp.dimension.relativeperiod.rewind.getValue();
DV.c.fixedperiod.records = DV.util.dimension.fixedperiod.getRecords();
DV.c.organisationunit.records = DV.util.dimension.organisationunit.getRecords();
DV.c.organisationunit.groupsetid = DV.util.dimension.organisationunit.getGroupSetId();