|
From: <he...@hy...> - 2007-03-08 23:52:23
|
Author: heather Date: 2007-03-08 15:52:21 -0800 (Thu, 08 Mar 2007) New Revision: 3677 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3677 Modified: trunk/web/js/listWidget.js trunk/web/js/requests.js trunk/web/portlet/criticalAlerts/View.jsp Log: fix for checkboxes not clearing when checked on refresh of the recent alerts portlet Modified: trunk/web/js/listWidget.js =================================================================== --- trunk/web/js/listWidget.js 2007-03-08 23:51:12 UTC (rev 3676) +++ trunk/web/js/listWidget.js 2007-03-08 23:52:21 UTC (rev 3677) @@ -120,6 +120,17 @@ } } +function ToggleRecentAlertButton(form) { + for (var i = 0; i < form.elements.length; i++) { + if (form.elements[i].type == 'submit' && + form.elements[i].className == 'CompactButton') { + form.elements[i].disabled = true; + form.elements[i].className = 'CompactButtonInactive'; + } + } + } + + function ToggleTwoButtons(widgetInstanceName, prefix, form, btnFunction) { if (btnFunction == "remove") var imgPrefix = "removeFrom"; Modified: trunk/web/js/requests.js =================================================================== --- trunk/web/js/requests.js 2007-03-08 23:51:12 UTC (rev 3676) +++ trunk/web/js/requests.js 2007-03-08 23:52:21 UTC (rev 3677) @@ -230,7 +230,6 @@ var token = alertText.token; var alertTable; var alertFunc; - unCheck(); if (alertText.token != null) { alertTable = document.getElementById('recentAlertsTable' + token); @@ -361,10 +360,11 @@ $('modifiedCritTime' + (token != null ? token : '')).innerHTML = 'Updated: ' + refreshTime(); - - //rTimer = setTimeout(alertFunc, 60000); // Refresh in 60 seconds + unCheck(); + + ToggleRecentAlertButton(FixAlertsForm); } function showAvailSummary(originalRequest) { @@ -768,4 +768,4 @@ $('listToggleAll').checked=false; } -} \ No newline at end of file +} Modified: trunk/web/portlet/criticalAlerts/View.jsp =================================================================== --- trunk/web/portlet/criticalAlerts/View.jsp 2007-03-08 23:51:12 UTC (rev 3676) +++ trunk/web/portlet/criticalAlerts/View.jsp 2007-03-08 23:52:21 UTC (rev 3677) @@ -44,13 +44,6 @@ function requestRecentAlerts<c:out value="${portlet.token}"/>() { var critAlertUrl = "<html:rewrite page="/dashboard/ViewCriticalAlerts.do?token=${portlet.token}"/>" new Ajax.Request(critAlertUrl, {method: 'get', onSuccess:showRecentAlerts, onFailure :reportError}); - - for (var f = 0; f < document.FixAlertsForm.elements.length; f++) { - if (document.FixAlertsForm.elements[i].type == 'submit' && document.FixAlertsForm.elements[i].className == 'CompactButton') { - document.FixAlertsForm.elements[i].disabled = true; - document.FixAlertsForm.elements[i].className = 'CompactButtonInactive'; - } - } } onloads.push(requestRecentAlerts<c:out value="${portlet.token}"/>); @@ -62,8 +55,6 @@ var url = ackAlertUrl + pars; new Ajax.Request(url); } - - </script> <c:set var="rssUrl" value="/rss/ViewCriticalAlerts.rss"/> @@ -91,7 +82,7 @@ <thead> <tr class="ListRow"> <td width="1%" class="ListHeaderCheckbox"> - <input type="checkbox" onclick="ToggleAll(this, widgetProperties, false);this.blur();" name="listToggleAll" id="listToggleAll"> + <input type="checkbox" onclick="ToggleAll(this, widgetProperties, false);" name="listToggleAll" id="listToggleAll"> </td> <td width="30%" class="ListHeaderInactiveSorted" align="left"> Date / Time<html:img page="/images/tb_sortdown.gif" height="9" width="9" border="0" /> |