Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [3487] [RHQ-1776] - fix operation>history subtab so that the pending/completed tables rerender properly after the periodic poll;
|
From: <jma...@rh...> - 2009-03-22 14:40:46
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [3487] [RHQ-1776] - fix operation>history subtab so that the pending/completed tables rerender properly after the periodic poll; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3487</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-03-22 09:40:43 -0500 (Sun, 22 Mar 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1776] - fix operation>history subtab so that the pending/completed tables rerender properly after the periodic poll; the trick is to have the a4j:poll mechanism clear out the dataModel via an actionListener before rerendering the model; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguicommonframeworkPagedDataTableUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/PagedDataTableUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguioperationhistorygroupResourceGroupOperationCompletedHistoryUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationCompletedHistoryUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguioperationhistorygroupResourceGroupOperationPendingHistoryUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationPendingHistoryUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqgroupoperationgroupOperationHistoryxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/operation/groupOperationHistory.xhtml</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceoperationresourceOperationHistoryxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/operation/resourceOperationHistory.xhtml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguicommonframeworkPagedDataTableUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/PagedDataTableUIBean.java (3486 => 3487)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/PagedDataTableUIBean.java 2009-03-22 14:03:48 UTC (rev 3486) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/PagedDataTableUIBean.java 2009-03-22 14:40:43 UTC (rev 3487) </span><span class="lines">@@ -18,6 +18,7 @@ </span><span class="cx"> */ package org.rhq.enterprise.gui.common.framework; </span><span class="add">+import javax.faces.event.ActionEvent; </span><span class="cx"> import javax.faces.model.DataModel; import javax.faces.model.SelectItem; </span><span class="lines">@@ -114,4 +115,8 @@ </span><span class="cx"> public int getMinimumPageSize() { return 15; } </span><span class="add">+ + public void clearDataModel(ActionEvent event) { + dataModel = null; + } </span><span class="cx"> } \ No newline at end of file </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguioperationhistorygroupResourceGroupOperationCompletedHistoryUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationCompletedHistoryUIBean.java (3486 => 3487)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationCompletedHistoryUIBean.java 2009-03-22 14:03:48 UTC (rev 3486) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationCompletedHistoryUIBean.java 2009-03-22 14:40:43 UTC (rev 3487) </span><span class="lines">@@ -22,8 +22,10 @@ </span><span class="cx"> import java.util.HashMap; import java.util.List; import java.util.Map; </span><span class="add">+ </span><span class="cx"> import javax.faces.application.FacesMessage; import javax.faces.model.DataModel; </span><span class="add">+ </span><span class="cx"> import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.operation.GroupOperationHistory; import org.rhq.core.domain.resource.group.ResourceGroup; </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguioperationhistorygroupResourceGroupOperationPendingHistoryUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationPendingHistoryUIBean.java (3486 => 3487)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationPendingHistoryUIBean.java 2009-03-22 14:03:48 UTC (rev 3486) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/history/group/ResourceGroupOperationPendingHistoryUIBean.java 2009-03-22 14:40:43 UTC (rev 3487) </span><span class="lines">@@ -22,8 +22,10 @@ </span><span class="cx"> import java.util.HashMap; import java.util.List; import java.util.Map; </span><span class="add">+ </span><span class="cx"> import javax.faces.application.FacesMessage; import javax.faces.model.DataModel; </span><span class="add">+ </span><span class="cx"> import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.operation.GroupOperationHistory; import org.rhq.core.domain.operation.ResourceOperationHistory; </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqgroupoperationgroupOperationHistoryxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/operation/groupOperationHistory.xhtml (3486 => 3487)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/operation/groupOperationHistory.xhtml 2009-03-22 14:03:48 UTC (rev 3486) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/operation/groupOperationHistory.xhtml 2009-03-22 14:40:43 UTC (rev 3487) </span><span class="lines">@@ -44,6 +44,8 @@ </span><span class="cx"> oncomplete="disableConditionalButtons();" interval="60000" ignoreDupResponses="true" </span><span class="add">+ status="commonStatus" + actionListener="#{ResourceGroupOperationPendingHistoryUIBean.clearDataModel}" </span><span class="cx"> reRender="resourceGroupOperationPendingHistoryDataTable" /> <rich:dataTable id="resourceGroupOperationPendingHistoryDataTable" rows="#{PageControl.ResourceGroupOperationPendingHistory.pageSize}" </span><span class="lines">@@ -68,22 +70,12 @@ </span><span class="cx"> <onc:select name="pendingSelectedItems" value="#{pendingItem.id}" /> </rich:column> </span><span class="rem">- - <rich:column rendered="#{param.debug}"> - <f:facet name="header"> - <onc:sortableColumnHeader sort="h.id"> - <h:outputText styleClass="headerText" value="ID" /> - </onc:sortableColumnHeader> - </f:facet> - - <h:outputText value="#{pendingItem.id}"/> - </rich:column> - </span><span class="add">+ </span><span class="cx"> <rich:column> <f:facet name="header"> <onc:sortableColumnHeader sort="h.createdTime"> <h:outputText styleClass="headerText" value="Date Submitted" /> </span><span class="rem">- </onc:sortableColumnHeader> </span><span class="add">+ </onc:sortableColumnHeader> </span><span class="cx"> </f:facet> <h:outputText value="#{pendingItem.createdTime}"> </span><span class="lines">@@ -179,6 +171,8 @@ </span><span class="cx"> oncomplete="disableConditionalButtons();" interval="60000" ignoreDupResponses="true" </span><span class="add">+ status="commonStatus" + actionListener="ResourceGroupOperationCompletedHistoryUIBean" </span><span class="cx"> reRender="resourceGroupOperationCompletedHistoryDataTable" /> <rich:dataTable rendered="#{resourceGroupOperationCompletedHistoryDataModel.rowCount gt 0}" id="resourceGroupOperationCompletedHistoryDataTable" </span><span class="lines">@@ -206,16 +200,6 @@ </span><span class="cx"> <onc:select name="completedSelectedItems" value="#{historyItem.id}" /> </rich:column> </span><span class="rem">- <rich:column rendered="#{param.debug}"> - <f:facet name="header"> - <onc:sortableColumnHeader sort="h.id"> - <h:outputText styleClass="headerText" value="ID" /> - </onc:sortableColumnHeader> - </f:facet> - - <h:outputText value="#{historyItem.id}"/> - </rich:column> - </span><span class="cx"> <rich:column> <f:facet name="header"> <onc:sortableColumnHeader sort="h.createdTime"> </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceoperationresourceOperationHistoryxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/operation/resourceOperationHistory.xhtml (3486 => 3487)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/operation/resourceOperationHistory.xhtml 2009-03-22 14:03:48 UTC (rev 3486) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/operation/resourceOperationHistory.xhtml 2009-03-22 14:40:43 UTC (rev 3487) </span><span class="lines">@@ -44,6 +44,8 @@ </span><span class="cx"> oncomplete="disableConditionalButtons();" interval="60000" ignoreDupResponses="true" </span><span class="add">+ status="commonStatus" + actionListener="#{ResourceOperationPendingHistoryUIBean.clearDataModel}" </span><span class="cx"> reRender="resourceOperationPendingHistoryDataTable" /> <rich:dataTable id="resourceOperationPendingHistoryDataTable" rows="#{PageControl.ResourceOperationPendingHistory.pageSize}" </span><span class="lines">@@ -175,6 +177,8 @@ </span><span class="cx"> oncomplete="disableConditionalButtons();" interval="60000" ignoreDupResponses="true" </span><span class="add">+ status="commonStatus" + actionListener="#{ResourceOperationCompletedHistoryUIBean.clearDataModel}" </span><span class="cx"> reRender="resourceOperationCompletedHistoryDataTable" /> <rich:dataTable id="resourceOperationCompletedHistoryDataTable" rows="#{PageControl.ResourceOperationCompletedHistory.pageSize}" </span> </pre> </div> </div> </body> </html> |