Merge authors: Jan Henrik Ă˜verland (janhenrik-overland) ------------------------------------------------------------ revno: 14652 [merge] committer: Jan Henrik Overland <janhenrik.overl...@gmail.com> branch nick: dhis2 timestamp: Fri 2014-04-04 13:40:18 +0200 message: ER, crud, work in progress. modified: dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/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-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js' --- dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-04 07:52:30 +0000 +++ dhis-2/dhis-web/dhis-web-event-reports/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-04-04 11:37:16 +0000 @@ -1574,10 +1574,12 @@ delete favorite.showSubTotals; delete favorite.type; - delete favorite.parentGraphMap; - delete favorite.id; + delete favorite.displayName; + delete favorite.access; + delete favorite.lastUpdated; + delete favorite.created; } return favorite; @@ -5228,6 +5230,13 @@ success: function(r) { var config = Ext.decode(r.responseText); + // sync + config.showTotals = config.totals; + delete config.totals; + + config.showSubTotals = config.subtotals; + delete config.subtotals; + web.report.getData(config, true); } });
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp