dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16783 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-09-23 16:03:47 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/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-apps/src/main/webapp/dhis-web-pivot/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js	2014-09-23 08:06:18 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js	2014-09-23 14:00:35 +0000
@@ -2096,15 +2096,19 @@
                             return '';
                         }
 
-                        if (config.htmlValue || Ext.isBoolean(config.htmlValue)) {
+                        if (Ext.isBoolean(config.htmlValue)) {
                             return config.htmlValue;
                         }
 
-                        if (config.value) {
-                            return value;
-                        }
-
-                        return '';
+                        if (config.htmlValue && isValue) {
+                            return Ext.isNumber(parseFloat(config.htmlValue)) ? parseFloat(config.htmlValue).toString() : config.htmlValue;
+                        }
+
+                        if (config.value && isValue) {
+                            return Ext.isNumber(parseFloat(config.value)) ? parseFloat(config.value).toString() : config.value;
+                        }
+
+                        return config.htmlValue || '';
                     };
 
 					if (!Ext.isObject(config)) {