← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12542: Fixed bug - Cannot select another favorite of tabular report.

 

------------------------------------------------------------
revno: 12542
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-10-10 09:55:39 +0700
message:
  Fixed bug - Cannot select another favorite of tabular report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/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-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-10-08 03:59:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-10-10 02:55:39 +0000
@@ -3547,7 +3547,7 @@
 							el = deleteArray[i];
 							Ext.create('Ext.tip.ToolTip', {
 								target: el,
-								html: 'Delete', //i18n
+								html: tr.i18n.delete,
 								'anchor': 'bottom',
 								anchorOffset: -14,
 								showDelay: 1000
@@ -5592,6 +5592,9 @@
 						menu: {},
 						hidden: true,
 						handler: function() {
+							if (TR.cmp.caseBasedFavorite.window) {
+								TR.cmp.caseBasedFavorite.window.destroy();
+							}
 							TR.cmp.caseBasedFavorite.window = TR.app.CaseFavoriteWindow();
 							TR.cmp.caseBasedFavorite.window.show();
 						},
@@ -5613,7 +5616,6 @@
 							if (TR.cmp.aggregateFavorite.window) {
 								TR.cmp.aggregateFavorite.window.destroy();
 							}
-							
 							TR.cmp.aggregateFavorite.window = TR.app.AggregateFavoriteWindow();
 							TR.cmp.aggregateFavorite.window.show();
 						},