Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13743 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: dhis2
timestamp: Wed 2014-01-15 16:14:04 +0100
message:
DV, download bug fixed.
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 2014-01-09 17:03:52 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-01-15 15:12:29 +0000
@@ -4398,7 +4398,7 @@
iconCls: 'ns-menu-item-datasource',
handler: function() {
if (ns.core.init.contextPath && ns.app.paramString) {
- window.open(ns.core.init.contextPath + '/api/analytics.json' + ns.core.web.getParamString(ns.app.xLayout, true));
+ window.open(ns.core.init.contextPath + '/api/analytics.json' + ns.core.web.analytics.getParamString(ns.app.xLayout, true));
}
}
},
@@ -4407,7 +4407,7 @@
iconCls: 'ns-menu-item-datasource',
handler: function() {
if (ns.core.init.contextPath && ns.app.paramString) {
- window.open(ns.core.init.contextPath + '/api/analytics.xml' + ns.core.web.getParamString(ns.app.xLayout, true));
+ window.open(ns.core.init.contextPath + '/api/analytics.xml' + ns.core.web.analytics.getParamString(ns.app.xLayout, true));
}
}
},
@@ -4416,7 +4416,7 @@
iconCls: 'ns-menu-item-datasource',
handler: function() {
if (ns.core.init.contextPath && ns.app.paramString) {
- window.location.href = ns.core.init.contextPath + '/api/analytics.xls' + ns.core.web.getParamString(ns.app.xLayout, true);
+ window.location.href = ns.core.init.contextPath + '/api/analytics.xls' + ns.core.web.analytics.getParamString(ns.app.xLayout, true);
}
}
},
@@ -4425,7 +4425,7 @@
iconCls: 'ns-menu-item-datasource',
handler: function() {
if (ns.core.init.contextPath && ns.app.paramString) {
- window.location.href = ns.core.init.contextPath + '/api/analytics.csv' + ns.core.web.getParamString(ns.app.xLayout, true);
+ window.location.href = ns.core.init.contextPath + '/api/analytics.csv' + ns.core.web.analytics.getParamString(ns.app.xLayout, true);
}
}
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
