[Hyperic-hq-discuss] hq r13792 - in trunk/web/portlet: availSummary metricViewer

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

Author: dcrutchf
Date: 2009-09-23 17:09:13 -0700 (Wed, 23 Sep 2009)
New Revision: 13792
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=13792

Modified:
   trunk/web/portlet/availSummary/Properties.jsp
   trunk/web/portlet/metricViewer/Properties.jsp
Log:
[HHQ-3398] - Cannot edit an Availability Summary portlet if more than one is on the dashboard
[HHQ-3409] - Remove from List for second Metric view portlet doesn't work

Added token to url for these two portlets so that they can be differentiated

Modified: trunk/web/portlet/availSummary/Properties.jsp
===================================================================
--- trunk/web/portlet/availSummary/Properties.jsp	2009-09-24 00:00:48 UTC (rev 13791)
+++ trunk/web/portlet/availSummary/Properties.jsp	2009-09-24 00:09:13 UTC (rev 13792)
@@ -34,7 +34,11 @@
 
 <hq:pageSize var="pageSize"/>
 <c:set var="widgetInstanceName" value="resources"/>
-<c:url var="selfAction" value="/dashboard/Admin.do?mode=availSummary"/>
+<c:url var="selfAction" value="/dashboard/Admin.do?mode=availSummary">
+  <c:if test="${not empty param.token}">
+    <c:param name="token" value="${param.token}"/>
+  </c:if>
+</c:url>
 
 <script  src="<html:rewrite page="/js/listWidget.js"/>" type="text/javascript"></script>
 <script type="text/javascript">

Modified: trunk/web/portlet/metricViewer/Properties.jsp
===================================================================
--- trunk/web/portlet/metricViewer/Properties.jsp	2009-09-24 00:00:48 UTC (rev 13791)
+++ trunk/web/portlet/metricViewer/Properties.jsp	2009-09-24 00:09:13 UTC (rev 13792)
@@ -33,7 +33,11 @@
 
 <hq:pageSize var="pageSize"/>
 <c:set var="widgetInstanceName" value="resources"/>
-<c:url var="selfAction" value="/dashboard/Admin.do?mode=metricViewer"/>
+<c:url var="selfAction" value="/dashboard/Admin.do?mode=metricViewer">
+  <c:if test="${not empty param.token}">
+    <c:param name="token" value="${param.token}"/>
+  </c:if>
+</c:url>
 
 <script  src="<html:rewrite page="/js/listWidget.js"/>" type="text/javascript"></script>
 <script type="text/javascript">