dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13964 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-02-09 18:38:19 +0100
message:
  PT, fav gui restore fix.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-02-06 11:09:49 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-02-09 17:36:50 +0000
@@ -1140,7 +1140,7 @@
 
 									if (favorite) {
 										favorite.name = record.data.name;
-console.log(favorite);
+
 										if (confirm(message)) {
 											Ext.Ajax.request({
 												url: ns.core.init.contextPath + '/api/reportTables/' + record.data.id,
@@ -2295,6 +2295,8 @@
 					},
 					disableCaching: false,
 					failure: function(r) {
+						ns.app.viewport.setGui(layout, xLayout, isUpdateGui);
+
 						web.mask.hide(ns.app.centerRegion);
 
 						if (Ext.Array.contains([413, 414], parseInt(r.status))) {
@@ -2308,6 +2310,7 @@
 						var response = api.response.Response(Ext.decode(r.responseText));
 
 						if (!response) {
+							ns.app.viewport.setGui(layout, xLayout, isUpdateGui);
 							web.mask.hide(ns.app.centerRegion);
 							return;
 						}