[Hyperic-hq-discuss] hq r13866 - in branches/HQ_4_1_2_1/web/resource: common/monitor/visibility group/inventory platform/autodiscovery platform/inventory

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

Author: dcrutchf
Date: 2009-10-15 17:21:46 -0700 (Thu, 15 Oct 2009)
New Revision: 13866
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13866

Modified:
   branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/MetricMetadata.jsp
   branches/HQ_4_1_2_1/web/resource/group/inventory/ListResources.jsp
   branches/HQ_4_1_2_1/web/resource/platform/autodiscovery/ListSchedule.jsp
   branches/HQ_4_1_2_1/web/resource/platform/inventory/PlatformServersView.jsp
Log:
Fix for HQ-1891

Modified: branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/MetricMetadata.jsp
===================================================================
--- branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/MetricMetadata.jsp	2009-10-16 00:19:52 UTC (rev 13865)
+++ branches/HQ_4_1_2_1/web/resource/common/monitor/visibility/MetricMetadata.jsp	2009-10-16 00:21:46 UTC (rev 13866)
@@ -210,7 +210,7 @@
 <tr>
 <td>
 <display:table items="${MetricSummaries}" var="summary" width="100%" cellspacing="0" cellpadding="0">
-<display:column width="15%" value="${summary.resource.name}" 
+<display:column width="15%" property="resource.name" 
   title="${resourceTypeTitle}" isLocalizedTitle="false" styleClass="ListCell"/>
 <display:column width="6%" property="minExpectedValue" title="resource.common.monitor.visibility.metricmetadata.expectedrange.low" styleClass="ListCell">
   <display:metricdecorator unit="${summary.measurementTemplate.units}" defaultKey="common.value.notavail"/>

Modified: branches/HQ_4_1_2_1/web/resource/group/inventory/ListResources.jsp
===================================================================
--- branches/HQ_4_1_2_1/web/resource/group/inventory/ListResources.jsp	2009-10-16 00:19:52 UTC (rev 13865)
+++ branches/HQ_4_1_2_1/web/resource/group/inventory/ListResources.jsp	2009-10-16 00:21:46 UTC (rev 13866)
@@ -107,7 +107,7 @@
     <display:column width="18%" property="name" sort="true" sortAttr="5"
                     defaultSort="true" title="common.header.Name" 
                     href="/resource/${resourceItem.entityId.typeName}/Inventory.do?mode=view&rid=${resourceItem.id}&type=${resourceItem.entityId.type}"/>
-    <display:column width="18%" value="${resourceItem.appdefResourceTypeValue.name}" title="resource.group.inventory.TypeTH" />
+    <display:column width="18%" property="appdefResourceTypeValue.name" title="resource.group.inventory.TypeTH" />
     <display:column width="44%" property="description" title="common.header.Description" />
     <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="10%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle">
       <display:availabilitydecorator resource="${resourceItem}"/>

Modified: branches/HQ_4_1_2_1/web/resource/platform/autodiscovery/ListSchedule.jsp
===================================================================
--- branches/HQ_4_1_2_1/web/resource/platform/autodiscovery/ListSchedule.jsp	2009-10-16 00:19:52 UTC (rev 13865)
+++ branches/HQ_4_1_2_1/web/resource/platform/autodiscovery/ListSchedule.jsp	2009-10-16 00:21:46 UTC (rev 13866)
@@ -102,7 +102,7 @@
                    nowrap="true" sort="true" sortAttr="15" defaultSort="true">
       <display:datedecorator/>
    </display:column>
-    <display:column width="30%" value="${aiSchedule.scheduleValue.scheduleString}"   
+    <display:column width="30%" property="scheduleValue.scheduleString"   
                     title="resource.autodiscovery.autoDiscoverySchedule.DateScheduledTH"/>
     <display:column width="33%" property="scanDesc" 
                     title="common.header.Description"/>

Modified: branches/HQ_4_1_2_1/web/resource/platform/inventory/PlatformServersView.jsp
===================================================================
--- branches/HQ_4_1_2_1/web/resource/platform/inventory/PlatformServersView.jsp	2009-10-16 00:19:52 UTC (rev 13865)
+++ branches/HQ_4_1_2_1/web/resource/platform/inventory/PlatformServersView.jsp	2009-10-16 00:21:46 UTC (rev 13866)
@@ -103,7 +103,7 @@
       <display:checkboxdecorator name="r" onclick="ToggleSelection(this, serversWidgetProperties)" styleClass="listMember"/>
     </display:column>
     <display:column property="name" title="resource.platform.inventory.servers.ServerTH" href="/resource/server/Inventory.do?mode=view&rid=${server.id}&type=${server.entityId.type}" sort="true" sortAttr="5" defaultSort="true" width="20%"/>
-    <display:column value="${server.serverType.name}" title="resource.platform.inventory.servers.TypeTH" width="20%"/>
+    <display:column property="serverType.name" title="resource.platform.inventory.servers.TypeTH" width="20%"/>
     <display:column property="installPath" title="resource.platform.inventory.servers.InstallPathTH" width="20%"/>
     <display:column property="description" title="common.header.Description" width="20%"/>
     <display:column property="id" title="resource.common.monitor.visibility.AvailabilityTH" width="20%" styleClass="ListCellCheckbox" headerStyleClass="ListHeaderCheckbox" valign="middle">