Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18166 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: dhis2
timestamp: Tue 2015-02-03 15:38:56 +0100
message:
Minor fix
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/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-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-02-03 13:35:17 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-02-03 14:37:36 +0000
@@ -6601,7 +6601,7 @@
// dimensions
requests.push({
- url: contextPath + '/api/dimensions.json?links=false&paging=false',
+ url: contextPath + '/api/dimensions.json?fields=id,name&paging=false',
success: function(r) {
init.dimensions = Ext.decode(r.responseText).dimensions || [];
fn();
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-02-03 13:35:17 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-02-03 14:37:36 +0000
@@ -2396,7 +2396,6 @@
xLayout = service.layout.getSyncronizedXLayout(xLayout, response);
if (!xLayout) {
- onFailure();
return;
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
