dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13890 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-01-29 13:34:50 +0100
message:
  PT, minor bug fixed.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2014-01-23 19:55:42 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2014-01-29 12:34:16 +0000
@@ -90,7 +90,7 @@
 
 			util.map.map2plugin = function(map) {
 				map.url = init.contextPath;
-				
+
 				if (map.id) {
 					return {id: map.id};
 				}
@@ -4058,7 +4058,7 @@
 			stage.clearValue();
 
 			dataElementsByStageStore.removeAll();
-			dataElementSelected.removeAll();			
+			dataElementSelected.removeAll();
 
 			stagesByProgramStore.proxy.url = gis.init.contextPath + '/api/programs/' + programId + '.json?viewClass=withoutOrganisationUnits&links=false&paging=false';
 			stagesByProgramStore.load({
@@ -4127,7 +4127,7 @@
 
 			fn = function(attributes) {
 
-				// data elements			
+				// data elements
 				if (Ext.isString(item)) {
 					Ext.Ajax.request({
 						url: gis.init.contextPath + '/api/programStages/' + item + '.json?links=false&paging=false',
@@ -4157,7 +4157,7 @@
 								for (var i = 0; i < attributes.length; i++) {
 									attributes[i].type = attributes[i].valueType;
 								}
-								
+
 								program.storage[programId] = attributes;
 							}
 
@@ -8068,7 +8068,7 @@
 			}
 
 
-			
+
 				//var textArea,
 					//window,
 					//text = 'DHIS.getMap(' + JSON.stringify(gis.util.map.map2plugin(gis.util.layout.getPluginConfig())) + ');';

=== 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	2014-01-29 11:35:59 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2014-01-29 12:34:16 +0000
@@ -2368,7 +2368,7 @@
 				ns.app.uuidObjectMap = Ext.applyIf((xColAxis ? xColAxis.uuidObjectMap : {}), (xRowAxis ? xRowAxis.uuidObjectMap : {}));
 
 				if (NS.isSessionStorage) {
-					web.events.setValueMouseHandlers(layout, response, ns.app.uuidDimUuidsMap, ns.app.uuidObjectMap);
+					web.events.setValueMouseHandlers(layout, response || xResponse, ns.app.uuidDimUuidsMap, ns.app.uuidObjectMap);
 					web.events.setColumnHeaderMouseHandlers(layout, xLayout, xResponse);
 					web.storage.session.set(layout, 'table');
 				}