Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [3803] RHQ-1989 Closing summary tab on group operation history no longer throws exception
|
From: <gh...@rh...> - 2009-04-20 17:23:22
|
<!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] [3803] RHQ-1989 Closing summary tab on group operation history no longer throws exception</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3803</dd> <dt>Author</dt> <dd>ghinkle</dd> <dt>Date</dt> <dd>2009-04-20 12:23:12 -0500 (Mon, 20 Apr 2009)</dd> </dl> <h3>Log Message</h3> <pre>RHQ-1989 Closing summary tab on group operation history no longer throws exception</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqgroupoperationgroupOperationHistoryDetailsxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/operation/groupOperationHistoryDetails.xhtml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqgroupoperationgroupOperationHistoryDetailsxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/operation/groupOperationHistoryDetails.xhtml (3802 => 3803)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/operation/groupOperationHistoryDetails.xhtml 2009-04-20 14:56:28 UTC (rev 3802) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/operation/groupOperationHistoryDetails.xhtml 2009-04-20 17:23:12 UTC (rev 3803) </span><span class="lines">@@ -11,126 +11,136 @@ </span><span class="cx"> xmlns:c="http://java.sun.com/jstl/core" xmlns:onc="http://jboss.org/on/component" xmlns:onf="http://jboss.org/on/function" </span><span class="rem">- xmlns:rich="http://richfaces.ajax4jsf.org/rich"> - </span><span class="add">+ xmlns:rich="http://richfaces.ajax4jsf.org/rich" + xmlns:a4j="http://richfaces.org/a4j"> + </span><span class="cx"> <ui:composition template="/rhq/group/layout/main.xhtml"> </span><span class="rem">- <ui:param name="pageTitle" value="View Operations History Details for ResourceGroup '#{ResourceGroupUIBean.name}'"/> - <ui:param name="selectedTabName" value="Operations.History"/> - - <!-- - 'item' will be used to: - 1) conditionally render a refresh meta header - 2) display the contents of this history item - --> - <ui:param name="item" value="#{ResourceGroupOperationHistoryDetailsUIBean.history}" /> - - <ui:define name="metaHeaders"> - <f:verbatim rendered="#{item.status eq 'INPROGRESS'}"> - <meta http-equiv="refresh" content="10" /> - </f:verbatim> - </ui:define> - - <ui:define name="content"> </span><span class="add">+<a4j:keepAlive beanName="ResourceGroupOperationHistoryDetailsUIBean"/> </span><span class="cx"> </span><span class="rem">- <h:form id="operationHistoryDetailsForm"> - <input type="hidden" name="groupId" value="${param.groupId}"/> - <input type="hidden" name="opId" value="${param.opId}"/> - <input type="hidden" name="category" value="#{param.category}" /> - - <h:outputLink value="/rhq/group/operation/groupOperationHistory.xhtml"> - <f:param name="groupId" value="#{param.groupId}" /> - <f:param name="category" value="#{param.category}" /> - - <h:outputText value="&lt; Return to Operation History"/> - </h:outputLink> - - <rich:panel styleClass="BlockContent"> - <f:facet name="header">Details</f:facet> - <table> - <tr> - <td align="right" style="width: 150px;">Operation:</td> - <td align="left"> - <h:outputText value="#{item.operationDefinition.displayName}" /> - </td> - </tr> - <tr> - <td align="right">Date Submitted:</td> - <td align="left"> - <h:outputText value="#{item.createdTime}"> - <f:converter converterId="UserDateTimeConverter" /> - </h:outputText> - </td> - </tr> - <tr> - <td align="right">Date Completed:</td> - <td align="left"> - <h:outputText value="#{item.modifiedTime}" rendered="#{item.status ne 'INPROGRESS'}" > - <f:converter converterId="UserDateTimeConverter" /> - </h:outputText> - </td> - </tr> - <tr> - <td align="right">Requester:</td> - <td align="left"> - <h:outputText value="#{item.subjectName}" rendered="#{!(empty item.subjectName)}" /> - <h:outputText value="(unknown)" rendered="#{empty item.subjectName}" /> - </td> - </tr> - <tr> - <td align="right">Status:</td> - <td align="left"> - <h:outputText rendered="#{item.status eq 'SUCCESS' or item.status eq 'INPROGRESS'}" - value="#{item.status}"/> - <h:outputLink rendered="#{item.status ne 'SUCCESS' and item.status ne 'INPROGRESS'}" - value="#" id="resultsLink"> - <h:outputText value="#{item.status}"/> - <rich:componentControl for="resultsModalPanel" attachTo="resultsLink" operation="show" event="onclick"/> - </h:outputLink> - <rich:modalPanel id="resultsModalPanel" width="600" height="400" - style="overflow: auto;"> - <f:facet name="header"> </span><span class="add">+ +<ui:param name="pageTitle" value="View Operations History Details for ResourceGroup '#{ResourceGroupUIBean.name}'"/> +<ui:param name="selectedTabName" value="Operations.History"/> + +<!-- +'item' will be used to: + 1) conditionally render a refresh meta header + 2) display the contents of this history item +--> +<ui:param name="item" value="#{ResourceGroupOperationHistoryDetailsUIBean.history}"/> + +<ui:define name="metaHeaders"> + <f:verbatim rendered="#{item.status eq 'INPROGRESS'}"> + <meta http-equiv="refresh" content="10"/> + </f:verbatim> +</ui:define> + +<ui:define name="content"> + +<h:form id="operationHistoryDetailsForm"> +<input type="hidden" name="groupId" value="${param.groupId}"/> +<input type="hidden" name="opId" value="${param.opId}"/> +<input type="hidden" name="category" value="#{param.category}"/> + +<h:outputLink value="/rhq/group/operation/groupOperationHistory.xhtml"> + <f:param name="groupId" value="#{param.groupId}"/> + <f:param name="category" value="#{param.category}"/> + + <h:outputText value="&lt; Return to Operation History"/> +</h:outputLink> + +<rich:panel styleClass="BlockContent"> + <f:facet name="header">Details</f:facet> + <table> + <tr> + <td align="right" style="width: 150px;">Operation:</td> + <td align="left"> + <h:outputText value="#{item.operationDefinition.displayName}"/> + </td> + </tr> + <tr> + <td align="right">Date Submitted:</td> + <td align="left"> + <h:outputText value="#{item.createdTime}"> + <f:converter converterId="UserDateTimeConverter"/> + </h:outputText> + </td> + </tr> + <tr> + <td align="right">Date Completed:</td> + <td align="left"> + <h:outputText value="#{item.modifiedTime}" rendered="#{item.status ne 'INPROGRESS'}"> + <f:converter converterId="UserDateTimeConverter"/> + </h:outputText> + </td> + </tr> + <tr> + <td align="right">Requester:</td> + <td align="left"> + <h:outputText value="#{item.subjectName}" rendered="#{!(empty item.subjectName)}"/> + <h:outputText value="(unknown)" rendered="#{empty item.subjectName}"/> + </td> + </tr> + <tr> + <td align="right">Status:</td> + <td align="left"> + <h:outputText rendered="#{item.status eq 'SUCCESS' or item.status eq 'INPROGRESS'}" + value="#{item.status}"/> + <h:outputLink rendered="#{item.status ne 'SUCCESS' and item.status ne 'INPROGRESS'}" + value="#" id="resultsLink"> + <h:outputText value="#{item.status}"/> + <rich:componentControl for="resultsModalPanel" attachTo="resultsLink" operation="show" + event="onclick"/> + </h:outputLink> + <rich:modalPanel id="resultsModalPanel" width="600" height="400" + style="overflow: auto;"> + <f:facet name="header"> </span><span class="cx"> <h:panelGroup> </span><span class="rem">- <h:outputText value="Results" /> </span><span class="add">+ <h:outputText value="Results"/> </span><span class="cx"> </h:panelGroup> </span><span class="rem">- </f:facet> - <f:facet name="controls"> </span><span class="add">+ </f:facet> + <f:facet name="controls"> </span><span class="cx"> <h:panelGroup> </span><span class="rem">- <h:graphicImage value="/images/close.png" style="cursor:pointer" id="resultsModelPanelHideLink"/> - <rich:componentControl for="resultsModalPanel" attachTo="resultsModelPanelHideLink" operation="hide" event="onclick"/> </span><span class="add">+ <h:graphicImage value="/images/close.png" style="cursor:pointer" + id="resultsModelPanelHideLink"/> + <rich:componentControl for="resultsModalPanel" attachTo="resultsModelPanelHideLink" + operation="hide" event="onclick"/> </span><span class="cx"> </h:panelGroup> </span><span class="rem">- </f:facet> - <div class="ErrorModalBody"> - <h:outputText value="#{item.errorMessage}" /> - </div> - </rich:modalPanel> - </td> - </tr> - </table> - </rich:panel> - - <rich:panel styleClass="BlockContent"> - <f:facet name="header">Parameters</f:facet> - <onc:config configurationDefinition="#{ResourceGroupOperationHistoryDetailsUIBean.parameters.configurationDefinition}" - configuration="#{ResourceGroupOperationHistoryDetailsUIBean.parameters.configuration}" - readOnly="true" - nullConfigurationDefinitionMessage="#{ResourceGroupOperationHistoryDetailsUIBean.parameters.nullConfigurationDefinitionMessage}" - nullConfigurationMessage="#{ResourceGroupOperationHistoryDetailsUIBean.parameters.nullConfigurationMessage}" - nullConfigurationStyle="InfoBlock"/> - </rich:panel> </span><span class="add">+ </f:facet> </span><span class="cx"> </span><span class="rem">- <rich:panel styleClass="BlockContent"> - <f:facet name="header">Resource Operation Results</f:facet> - - <h:panelGrid columns="1" styleClass="data-table"> - - <ui:param name="resourceGroupOperationHistoryDetailsDataModel" value="#{ResourceGroupOperationHistoryDetailsUIBean.dataModel}"/> - - <h:outputText value="There were no resources in the group when this operation was executed" - rendered="#{resourceGroupOperationHistoryDetailsDataModel.rowCount eq 0}"/> - - <rich:dataTable rendered="#{resourceGroupOperationHistoryDetailsDataModel.rowCount gt 0}" - id="resourceGroupOperationHistoryDetailsDataTable" </span><span class="add">+ <div class="ErrorModalBody"> + <h:outputText value="#{item.errorMessage}"/> + </div> + </rich:modalPanel> + </td> + </tr> + </table> +</rich:panel> + +<rich:panel styleClass="BlockContent"> + <f:facet name="header">Parameters</f:facet> + <onc:config + configurationDefinition="#{ResourceGroupOperationHistoryDetailsUIBean.parameters.configurationDefinition}" + configuration="#{ResourceGroupOperationHistoryDetailsUIBean.parameters.configuration}" + readOnly="true" + nullConfigurationDefinitionMessage="#{ResourceGroupOperationHistoryDetailsUIBean.parameters.nullConfigurationDefinitionMessage}" + nullConfigurationMessage="#{ResourceGroupOperationHistoryDetailsUIBean.parameters.nullConfigurationMessage}" + nullConfigurationStyle="InfoBlock"/> +</rich:panel> + +<rich:panel styleClass="BlockContent"> + <f:facet name="header">Resource Operation Results</f:facet> + + <h:panelGrid columns="1" styleClass="data-table"> + + <ui:param name="resourceGroupOperationHistoryDetailsDataModel" + value="#{ResourceGroupOperationHistoryDetailsUIBean.dataModel}"/> + + <h:outputText value="There were no resources in the group when this operation was executed" + rendered="#{resourceGroupOperationHistoryDetailsDataModel.rowCount eq 0}"/> + + <rich:dataTable rendered="#{resourceGroupOperationHistoryDetailsDataModel.rowCount gt 0}" + id="resourceGroupOperationHistoryDetailsDataTable" </span><span class="cx"> rows="#{PageControl.ResourceGroupOperationHistoryDetails.pageSize}" value="#{resourceGroupOperationHistoryDetailsDataModel}" var="resourceHistoryItem" </span><span class="lines">@@ -140,102 +150,105 @@ </span><span class="cx"> footerClass="on-pager-footer" onRowMouseOver="this.style.backgroundColor='#E7E7E7'" onRowMouseOut="this.style.backgroundColor='#{a4jSkin.tableBackgroundColor}'"> </span><span class="rem">- - <f:facet name="PageControlView"> - <onc:paginationControl id="ResourceGroupOperationHistoryDetails" /> - </f:facet> - - <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="#{resourceHistoryItem.id}"/> - </rich:column> - - <rich:column> - <f:facet name="header"> - <onc:sortableColumnHeader sort="h.createdTime"> - <h:outputText styleClass="headerText" value="Date Submitted" /> - </onc:sortableColumnHeader> - </f:facet> - - <h:outputText value="#{resourceHistoryItem.createdTime}"> - <f:converter converterId="UserDateTimeConverter" /> - </h:outputText> - </rich:column> - - <rich:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" value="Name" /> - </f:facet> - - <h:outputLink value="/rhq/resource/operation/resourceOperationHistoryDetails.xhtml" > - <f:param name="id" value="#{resourceHistoryItem.resource.id}" /> - <f:param name="opId" value="#{resourceHistoryItem.id}" /> - <h:outputText value="#{resourceHistoryItem.operationDefinition.displayName}"/> - </h:outputLink> </span><span class="cx"> </span><span class="rem">- </rich:column> - - <rich:column> - <f:facet name="header"> - <h:outputText styleClass="headerText" value="Resource" /> - </f:facet> - - <h:outputText value="#{resourceHistoryItem.resource.name}"/> - </rich:column> - - <rich:column> - <f:facet name="header"> - <onc:sortableColumnHeader sort="h.status"> - <h:outputText styleClass="headerText" value="Status" /> - </onc:sortableColumnHeader> - </f:facet> </span><span class="add">+ <f:facet name="PageControlView"> + <onc:paginationControl id="ResourceGroupOperationHistoryDetails"/> + </f:facet> </span><span class="cx"> </span><span class="rem">- <h:outputText value="#{resourceHistoryItem.status}"/> - </rich:column> - - <rich:column> - <f:facet name="header"> - <onc:sortableColumnHeader sort="h.subjectName"> - <h:outputText styleClass="headerText" value="User" /> - </onc:sortableColumnHeader> - </f:facet> - - <h:outputText value="#{resourceHistoryItem.subjectName}"/> - </rich:column> - - <f:facet name="footer"> - <rich:columnGroup> - <rich:column colspan="6" width="100%"> - <ui:param name="paginationDataTableName" value="resourceGroupOperationHistoryDetailsDataTable"/> - <ui:param name="paginationDataModel" value="#{resourceGroupOperationHistoryDetailsDataModel}"/> - <ui:param name="paginationPageControl" value="#{PageControl.ResourceGroupOperationHistoryDetails}"/> </span><span class="add">+ <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="#{resourceHistoryItem.id}"/> + </rich:column> + + <rich:column> + <f:facet name="header"> + <onc:sortableColumnHeader sort="h.createdTime"> + <h:outputText styleClass="headerText" value="Date Submitted"/> + </onc:sortableColumnHeader> + </f:facet> + + <h:outputText value="#{resourceHistoryItem.createdTime}"> + <f:converter converterId="UserDateTimeConverter"/> + </h:outputText> + </rich:column> + + <rich:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" value="Name"/> + </f:facet> + + <h:outputLink value="/rhq/resource/operation/resourceOperationHistoryDetails.xhtml"> + <f:param name="id" value="#{resourceHistoryItem.resource.id}"/> + <f:param name="opId" value="#{resourceHistoryItem.id}"/> + <h:outputText value="#{resourceHistoryItem.operationDefinition.displayName}"/> + </h:outputLink> + + </rich:column> + + <rich:column> + <f:facet name="header"> + <h:outputText styleClass="headerText" value="Resource"/> + </f:facet> + + <h:outputText value="#{resourceHistoryItem.resource.name}"/> + </rich:column> + + <rich:column> + <f:facet name="header"> + <onc:sortableColumnHeader sort="h.status"> + <h:outputText styleClass="headerText" value="Status"/> + </onc:sortableColumnHeader> + </f:facet> + + <h:outputText value="#{resourceHistoryItem.status}"/> + </rich:column> + + <rich:column> + <f:facet name="header"> + <onc:sortableColumnHeader sort="h.subjectName"> + <h:outputText styleClass="headerText" value="User"/> + </onc:sortableColumnHeader> + </f:facet> + + <h:outputText value="#{resourceHistoryItem.subjectName}"/> + </rich:column> + + <f:facet name="footer"> + <rich:columnGroup> + <rich:column colspan="6" width="100%"> + <ui:param name="paginationDataTableName" + value="resourceGroupOperationHistoryDetailsDataTable"/> + <ui:param name="paginationDataModel" + value="#{resourceGroupOperationHistoryDetailsDataModel}"/> + <ui:param name="paginationPageControl" + value="#{PageControl.ResourceGroupOperationHistoryDetails}"/> </span><span class="cx"> <ui:include src="/rhq/resource/include/pagination.xhtml"/> </span><span class="rem">- </rich:column> - </rich:columnGroup> - </f:facet> - - </rich:dataTable> </span><span class="add">+ </rich:column> + </rich:columnGroup> + </f:facet> </span><span class="cx"> </span><span class="rem">- </h:panelGrid> </span><span class="add">+ </rich:dataTable> </span><span class="cx"> </span><span class="rem">- </rich:panel> - - <h:outputLink value="/rhq/group/operation/groupOperationHistory.xhtml"> - <f:param name="groupId" value="#{param.groupId}" /> - <f:param name="category" value="#{param.category}" /> - - <h:outputText value="&lt; Return to Operation History"/> - </h:outputLink> - - </h:form> </span><span class="add">+ </h:panelGrid> </span><span class="cx"> </span><span class="rem">- </ui:define> </span><span class="add">+</rich:panel> </span><span class="cx"> </span><span class="add">+<h:outputLink value="/rhq/group/operation/groupOperationHistory.xhtml"> + <f:param name="groupId" value="#{param.groupId}"/> + <f:param name="category" value="#{param.category}"/> + + <h:outputText value="&lt; Return to Operation History"/> +</h:outputLink> + +</h:form> + +</ui:define> + </span><span class="cx"> </ui:composition> </html> </span> </pre> </div> </div> </body> </html> |