Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 18178 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Thu 2015-02-05 13:35:41 +0100
message:
Dashboard, improved validation.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.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-visualizer/plugin.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html 2015-02-02 16:39:05 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html 2015-02-05 11:45:48 +0000
@@ -22,7 +22,7 @@
DHIS.getChart({
url: url,
el: 'chart1',
- uid: 'IXF2whoSbRn',
+ uid: 'ovB8VvUoydp',
crossDomain: false
});
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-02-02 16:39:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js 2015-02-05 12:34:16 +0000
@@ -4030,7 +4030,9 @@
var response = api.response.Response((r.responseText ? Ext.decode(r.responseText) : r));
if (!response) {
- web.mask.hide(ns.app.centerRegion);
+ if (!ns.skipMask) {
+ web.mask.hide(ns.app.centerRegion);
+ }
return;
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-02-02 16:39:05 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js 2015-02-05 12:34:16 +0000
@@ -4600,8 +4600,10 @@
success = function(r) {
var response = api.response.Response((r.responseText ? Ext.decode(r.responseText) : r));
- if (!response && !ns.skipMask) {
- web.mask.hide(ns.app.centerRegion);
+ if (!response) {
+ if (!ns.skipMask) {
+ web.mask.hide(ns.app.centerRegion);
+ }
return;
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js 2015-01-21 19:13:50 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js 2015-02-05 12:34:16 +0000
@@ -3568,8 +3568,10 @@
success = function(r) {
var response = api.response.Response((r.responseText ? Ext.decode(r.responseText) : r));
- if (!response && !ns.skipMask) {
- web.mask.hide(ns.app.centerRegion);
+ if (!response) {
+ if (!ns.skipMask) {
+ web.mask.hide(ns.app.centerRegion);
+ }
return;
}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js 2015-01-26 15:12:42 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js 2015-02-05 12:34:16 +0000
@@ -3262,7 +3262,9 @@
var response = api.response.Response((r.responseText ? Ext.decode(r.responseText) : r));
if (!response) {
- web.mask.hide(ns.app.centerRegion);
+ if (!ns.skipMask) {
+ web.mask.hide(ns.app.centerRegion);
+ }
return;
}
_______________________________________________
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
