dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 11490 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-07-23 15:51:10 +0200
message:
  (PT) Dimension highlighting bug fixed.
modified:
  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/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/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-07-22 15:03:42 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-07-23 13:50:11 +0000
@@ -4567,8 +4567,6 @@
 		pt.cmp = PT.app.getCmp();
 
 		pt.viewport = createViewport();
-		
-		pt.uuidUuidsMap = {};
 	};
 
 	Ext.Ajax.request({

=== 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-22 15:03:42 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-07-23 13:50:11 +0000
@@ -1218,7 +1218,7 @@
 				
 				// add uuids array to leaves
 				if (aAllObjects.length) {
-					for (var i = 0, leaf, parentUuids, span = aAllObjects.length > 1 ? aSpan[aAllObjects.length - 2] : 1, leafUuids = []; i < aAllObjects[aAllObjects.length - 1].length; i++) {
+					for (var i = 0, leaf, parentUuids, obj, span = aAllObjects.length > 1 ? aSpan[aAllObjects.length - 2] : 1, leafUuids = []; i < aAllObjects[aAllObjects.length - 1].length; i++) {
 						leaf = aAllObjects[aAllObjects.length - 1][i];
 						leafUuids.push(leaf.uuid);
 						parentUuids = [];
@@ -1544,8 +1544,9 @@
 						valueItemsRow = [];
 						valueObjectsRow = [];
 
-						for (var j = 0, id, value, htmlValue, empty, uuid, uuids = []; j < colSize; j++) {
+						for (var j = 0, id, value, htmlValue, empty, uuid, uuids; j < colSize; j++) {
 							empty = false;
+							uuids = [];
 							
 							// meta data uid
 							id = (xColAxis ? pt.util.str.replaceAll(xColAxis.ids[j], '-', '') : '') + (xRowAxis ? pt.util.str.replaceAll(xRowAxis.ids[i], '-', '') : '');
@@ -1553,7 +1554,7 @@
 							// value html element id
 							uuid = Ext.data.IdGenerator.get('uuid').generate();
 							
-							// col and row dim element ids
+							// col and row dim element ids							
 							if (xColAxis) {
 								uuids = uuids.concat(xColAxis.objects.all[xColAxis.dims - 1][j].uuids);
 							}