Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13501 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: dhis2
timestamp: Mon 2013-12-30 21:46:35 +0100
message:
DV, validation bug fixed
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.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/webapp/dhis-web-visualizer/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js 2013-12-30 17:41:20 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js 2013-12-30 20:44:50 +0000
@@ -492,9 +492,14 @@
config.rows = getValidatedDimensionArray(config.rows);
config.filters = getValidatedDimensionArray(config.filters);
- // at least one dimension specified as column or row
- if (!(config.columns || config.rows)) {
- alert(NS.i18n.at_least_one_dimension_must_be_specified_as_row_or_column);
+ // at least one dimension specified as column and row
+ if (!config.columns) {
+ alert('No series items selected');
+ return;
+ }
+
+ if (!config.rows) {
+ alert('No category items selected');
return;
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
