System metrics now goes to layout as tracks. Fixing other small issue…

…s around it.
hyperic · Dec 30, 2011 · 1aef8d1 · 1aef8d1
1 parent 906e656
commit 1aef8d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/dojo-release-1.5.0-src/hyperic/widget/avail/_Availability.js b/dojo-release-1.5.0-src/hyperic/widget/avail/_Availability.js
@@ -320,10 +320,6 @@ dojo.declare("hyperic.widget.avail._Availability",
     	if(this.eid) {
     		paramObj['eid'] = this.eid;
     	}
-    	var trackObj = this.getTracks();
-    	if (trackObj) {
-    		paramObj['tracks'] = trackObj;    		
-    	}
         paramObj['legends'] = this.asLegendsParams();
         paramObj['supportLegends'] = this.supportLegends;
     	return paramObj;

diff --git a/dojo-release-1.5.0-src/hyperic/widget/base/_WallMountItem.js b/dojo-release-1.5.0-src/hyperic/widget/base/_WallMountItem.js
@@ -259,11 +259,12 @@ dojo.declare("hyperic.widget.base._WallMountItem",
     		return null;
     	}
     	for(var i=0; i<this._storeSubsHdls.length; i++){
-    		// XXX: for now just get subscribes containing 'tavail'.
+    		// XXX: for now just get subscribes containing 'tavail' and 'system'.
     		//      need to make this more clever!!!
     		//      it might be better to keep track info in
     		//      separately outside of subs handles.
-    		if(this._storeSubsHdls[i][0].indexOf("tavail") === -1) {
+    		var tmp = this._storeSubsHdls[i][0];
+    		if(!tmp.indexOf("tavail") === -1 || !tmp.indexOf("system") === -1) {
     			continue;
     		}
     		var _str = this._storeSubsHdls[i][0].replace("/hyperic/","")
@@ -468,6 +469,10 @@ dojo.declare("hyperic.widget.base._WallMountItem",
             paramObj['width'] = this.width;    		
             paramObj['height'] = this.height;         
     	}
+    	var trackObj = this.getTracks();
+    	if (trackObj) {
+    		paramObj['tracks'] = trackObj;    		
+    	}
         paramObj['color'] = this.color;
         paramObj['titlePosition'] = this.getTitlePosition();
     	paramObj['title'] = this.getTitle();