dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32850
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16727: PT DV GIS ER EV, 403 error handling.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16727 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-09-15 17:15:39 -0700
message:
PT DV GIS ER EV, 403 error handling.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/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-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties 2014-09-10 20:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties 2014-09-16 00:11:41 +0000
@@ -166,3 +166,4 @@
show_col_totals=Show column totals
show_row_totals=Show row totals
select_sub_units=Select sub-units
+you_do_not_have_access_to_all_items_in_this_favorite=You do not have access to all items in this favorite
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-10 20:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-16 00:11:41 +0000
@@ -6135,7 +6135,12 @@
failure: function(r) {
web.mask.hide(ns.app.centerRegion);
- alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
+ if (Ext.Array.contains([403], r.status)) {
+ alert(NS.i18n.you_do_not_have_access_to_all_items_in_this_favorite);
+ }
+ else {
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
+ }
},
success: function(r) {
var config = Ext.decode(r.responseText);
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-09-10 20:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-09-16 00:11:41 +0000
@@ -192,3 +192,4 @@
open_last_table=Open last table
chart_options=Chart options
select_sub_units=Select sub-units
+you_do_not_have_access_to_all_items_in_this_favorite=You do not have access to all items in this favorite
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-10 20:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-16 00:11:41 +0000
@@ -5765,7 +5765,13 @@
url: init.contextPath + '/api/eventCharts/' + id + '.json?fields=' + conf.url.analysisFields.join(','),
failure: function(r) {
web.mask.hide(ns.app.centerRegion);
- alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
+
+ if (Ext.Array.contains([403], r.status)) {
+ alert(NS.i18n.you_do_not_have_access_to_all_items_in_this_favorite);
+ }
+ else {
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
+ }
},
success: function(r) {
var layoutConfig = Ext.decode(r.responseText),
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties 2014-09-10 20:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties 2014-09-16 00:11:41 +0000
@@ -412,3 +412,4 @@
open_last_chart=Open last chart
clear=Clear
select_sub_units=Select sub-units
+you_do_not_have_access_to_all_items_in_this_favorite=You do not have access to all items in this favorite
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2014-09-01 12:07:34 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js 2014-09-16 00:11:41 +0000
@@ -907,10 +907,15 @@
setMap();
};
- failure = function() {
+ failure = function(r) {
gis.olmap.mask.hide();
- alert('Map id not recognized' + (gis.el ? ' (' + gis.el + ')' : ''));
- return;
+
+ if (Ext.Array.contains([403], r.status)) {
+ alert(NS.i18n.you_do_not_have_access_to_all_items_in_this_favorite);
+ }
+ else {
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
+ }
};
if (isPlugin) {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties 2014-09-10 20:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties 2014-09-16 00:11:41 +0000
@@ -165,3 +165,4 @@
min=Min
max=Max
select_sub_units=Select sub-units
+you_do_not_have_access_to_all_items_in_this_favorite=You do not have access to all items in this favorite
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-09-10 20:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-09-16 00:11:41 +0000
@@ -2361,7 +2361,13 @@
url: init.contextPath + '/api/reportTables/' + id + '.json?fields=' + conf.url.analysisFields.join(','),
failure: function(r) {
web.mask.hide(ns.app.centerRegion);
- alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
+
+ if (Ext.Array.contains([403], r.status)) {
+ alert(NS.i18n.you_do_not_have_access_to_all_items_in_this_favorite);
+ }
+ else {
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
+ }
},
success: function(r) {
var layoutConfig = Ext.decode(r.responseText),
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties 2014-09-10 20:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties 2014-09-16 00:11:41 +0000
@@ -229,3 +229,4 @@
table_layout=Table layout
type=Type
select_sub_units=Select sub-units
+you_do_not_have_access_to_all_items_in_this_favorite=You do not have access to all items in this favorite
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-10 20:32:01 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-16 00:11:41 +0000
@@ -2190,7 +2190,13 @@
url: init.contextPath + '/api/charts/' + id + '.json?fields=' + ns.core.conf.url.analysisFields.join(','),
failure: function(r) {
web.mask.hide(ns.app.centerRegion);
- alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
+
+ if (Ext.Array.contains([403], r.status)) {
+ alert(NS.i18n.you_do_not_have_access_to_all_items_in_this_favorite);
+ }
+ else {
+ alert(r.status + '\n' + r.statusText + '\n' + r.responseText);
+ }
},
success: function(r) {
var layoutConfig = Ext.decode(r.responseText),
