dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 11418 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-07-17 15:42:07 +0200
message:
  (PT) Validation bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-07-16 13:18:13 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-07-17 13:41:17 +0000
@@ -934,7 +934,7 @@
 					layout = pt.api.layout.Layout(xLayout);
 				
 					if (layout) {
-						dimensions = [].concat(layout.columns, layout.rows, layout.filters);
+						dimensions = [].concat(layout.columns || [], layout.rows || [], layout.filters || []);
 						
 						for (var i = 0, idNameMap = response.metaData.names, dimItems; i < dimensions.length; i++) {							
 							dimItems = dimensions[i].items;
@@ -1250,12 +1250,12 @@
 				for (var i = 0; i < aAllObjects.length; i++) {
 					for (var j = 0, object; j < aAllObjects[i].length; j++) {
 						object = aAllObjects[i][j];
-console.log(object.uuid, object);
+//console.log(object.uuid, object);
 						uuidObjectMap[object.uuid] = object;
 					}
 				}
 
-console.log("aAllObjects", aAllObjects);				
+//console.log("aAllObjects", aAllObjects);				
 				
 				return {
 					type: type,