[Hyperic-hq-discuss] hq r13923 - in branches/HQ_4_2_1: src/org/hyperic/hq/bizapp/server/session web/js/lib

[<dcr...@hy...>]

Author: dcrutchf
Date: 2009-11-04 13:53:28 -0800 (Wed, 04 Nov 2009)
New Revision: 13923
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13923

Modified:
   branches/HQ_4_2_1/src/org/hyperic/hq/bizapp/server/session/DashboardPortletBossEJBImpl.java
   branches/HQ_4_2_1/web/js/lib/lib.js
Log:
[HQ-1457] - Units lable are missing in Saved Charts

Modified: branches/HQ_4_2_1/src/org/hyperic/hq/bizapp/server/session/DashboardPortletBossEJBImpl.java
===================================================================
--- branches/HQ_4_2_1/src/org/hyperic/hq/bizapp/server/session/DashboardPortletBossEJBImpl.java	2009-11-04 21:49:37 UTC (rev 13922)
+++ branches/HQ_4_2_1/src/org/hyperic/hq/bizapp/server/session/DashboardPortletBossEJBImpl.java	2009-11-04 21:53:28 UTC (rev 13923)
@@ -155,6 +155,7 @@
             if (!metrics.isEmpty()) {
                 Measurement measurement = (Measurement) metrics.get(0);
                 jObj.put("measurementName", measurement.getTemplate().getName());
+                jObj.put("measurementUnits", measurement.getTemplate().getUnits());
             }
             
             List data = dMan.getHistoricalData(metrics, begin, end,

Modified: branches/HQ_4_2_1/web/js/lib/lib.js
===================================================================
--- branches/HQ_4_2_1/web/js/lib/lib.js	2009-11-04 21:49:37 UTC (rev 13922)
+++ branches/HQ_4_2_1/web/js/lib/lib.js	2009-11-04 21:53:28 UTC (rev 13923)
@@ -758,7 +758,7 @@
 */
 hyperic.widget.Chart = function(node, kwArgs) {
     var that = this;
-    that.subscriptions=[];
+    that.subscriptions=[];	
     that.create = function(node, kwArgs) {
     	// display the metric name for a multiple metric single resource chart
     	var chartDisplayName = kwArgs.name;  
@@ -766,7 +766,7 @@
     	{
         	if(chartDisplayName.indexOf(kwArgs.measurementName) == -1)
             {
-        		chartDisplayName += ': ' + kwArgs.measurementName;
+        		chartDisplayName += ': ' + kwArgs.measurementName + ", Units: " + kwArgs.measurementUnits;
             }     		
     	}
 
@@ -2102,6 +2102,7 @@
                         }
                     }
                     that.charts[chart].measurementName = data[0].measurementName;
+                    that.charts[chart].measurementUnits = data[0].measurementUnits;
                     that.charts[chart].last_updated = new Date();
                     that.charts[chart].maxTitleLength = (that.sheets.content.offsetWidth - 150) * 1.5;
                 }