Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5567 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: dhis2
timestamp: Thu 2011-12-22 23:15:23 +0100
message:
Minor fix.
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/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/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-12-22 21:54:13 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2011-12-22 22:14:17 +0000
@@ -709,9 +709,15 @@
params.hideSubtitle = DV.cmp.favorite.hidesubtitle.getValue();
params.hideLegend = DV.cmp.favorite.hidelegend.getValue();
params.userOrganisationUnit = DV.cmp.favorite.userorganisationunit.getValue();
- params.xAxisLabel = DV.cmp.favorite.xaxislabel.getValue();
- params.yAxisLabel = DV.cmp.favorite.yaxislabel.getValue();
- params.targetLineValue = DV.cmp.favorite.targetlinevalue.getValue();
+ if (DV.cmp.favorite.xaxislabel.getValue()) {
+ params.xAxisLabel = DV.cmp.favorite.xaxislabel.getValue();
+ }
+ if (DV.cmp.favorite.yaxislabel.getValue()) {
+ params.yAxisLabel = DV.cmp.favorite.yaxislabel.getValue();
+ }
+ if (DV.cmp.favorite.targetlinevalue.getValue()) {
+ params.targetLineValue = DV.cmp.favorite.targetlinevalue.getValue();
+ }
if (params.targetLineValue && !DV.cmp.favorite.targetlinelabel.isDisabled()) {
params.targetLineLabel = DV.cmp.favorite.targetlinelabel.getValue();
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
