Merge authors: Jan Henrik Ă˜verland (janhenrik-overland) ------------------------------------------------------------ revno: 7859 [merge] committer: Jan Henrik Overland <janhenrik.overl...@gmail.com> branch nick: dhis2 timestamp: Fri 2012-08-03 14:05:50 +0200 message: Fixed periods and chart title bugs fixed. modified: dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java 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/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java' --- dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java 2012-07-25 00:20:50 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java 2012-08-03 11:56:13 +0000 @@ -463,6 +463,8 @@ chart.setRewindRelativePeriods( rewind ); + chart.getPeriods().clear(); + if ( periodIds != null ) { List<Period> periods = new ArrayList<Period>(); === 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-08-02 18:51:22 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2012-08-03 11:56:13 +0000 @@ -1266,7 +1266,7 @@ DV.c.currentFavorite = { id: id, name: name - }; + }; DV.cmp.toolbar.share.xable(); DV.util.mask.hideMask(); if (fn) { @@ -1575,7 +1575,6 @@ setChart: function(exe, id) { DV.chart.reset(); - if (id) { Ext.Ajax.request({ url: DV.conf.finals.ajax.path_api + DV.conf.finals.ajax.favorite_get + id + '.json?links=false&paging=false', @@ -1661,6 +1660,11 @@ DV.c.baselinevalue = f.baseLineValue ? parseFloat(f.baseLineValue) : null; DV.c.baselinelabel = f.baseLineLabel ? f.baseLineLabel : null; + DV.c.currentFavorite = { + id: f.id, + name: f.name + }; + if (exe) { this.extendChart(exe, id); } @@ -4719,10 +4723,6 @@ itemclick: function(g, r) { g.getSelectionModel().select([], false); this.up('menu').hide(); - DV.c.currentFavorite = { - id: r.data.id, - name: r.data.name - }; DV.exe.execute(r.data.id); } }
_______________________________________________ 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