Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [1656] RHQ-221 clear the config on create cancel.
|
From: <jsh...@rh...> - 2008-09-30 20:57:32
|
<!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] [1656] RHQ-221 clear the config on create cancel.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1656</dd> <dt>Author</dt> <dd>jshaughn</dd> <dt>Date</dt> <dd>2008-09-30 15:57:26 -0500 (Tue, 30 Sep 2008)</dd> </dl> <h3>Log Message</h3> <pre>RHQ-221 clear the config on create cancel. And related work in RHQ-222, embed the isFullyEditable check in the isReadOnly check for ConfigUIComponent</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulescoreguisrcmainjavaorgrhqcoreguiconfigurationAbstractPropertyBagUIComponentTreeFactoryjava">rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java</a></li> <li><a href="#rhqtrunkmodulescoreguisrcmainjavaorgrhqcoreguiconfigurationConfigUIComponentjava">rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigUIComponent.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceCreateNewConfigurationChildResourceUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewConfigurationChildResourceUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceinventorycreateconfig2xhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-config-2.xhtml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulescoreguisrcmainjavaorgrhqcoreguiconfigurationAbstractPropertyBagUIComponentTreeFactoryjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java (1655 => 1656)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java 2008-09-30 19:25:14 UTC (rev 1655) +++ rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java 2008-09-30 20:57:26 UTC (rev 1656) </span><span class="lines">@@ -1073,6 +1073,7 @@ </span><span class="cx"> } private boolean isReadOnly(PropertyDefinition propertyDefinition) { </span><span class="add">+ // a fully editable config overrides any other means of setting read only </span><span class="cx"> return (!this.config.isFullyEditable() && (this.config.isReadOnly() || (propertyDefinition.isReadOnly() && !isUndefinedRequiredProperty(propertyDefinition)))); } </span></pre></div> <a id="rhqtrunkmodulescoreguisrcmainjavaorgrhqcoreguiconfigurationConfigUIComponentjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigUIComponent.java (1655 => 1656)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigUIComponent.java 2008-09-30 19:25:14 UTC (rev 1655) +++ rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigUIComponent.java 2008-09-30 20:57:26 UTC (rev 1656) </span><span class="lines">@@ -97,6 +97,9 @@ </span><span class="cx"> */ public boolean isReadOnly() { </span><span class="add">+ if (isFullyEditable()) + return false; + </span><span class="cx"> if (this.readOnly == null) { this.readOnly = FacesComponentUtility.getExpressionAttribute(this, READ_ONLY_ATTRIBUTE, Boolean.class); } </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceCreateNewConfigurationChildResourceUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewConfigurationChildResourceUIBean.java (1655 => 1656)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewConfigurationChildResourceUIBean.java 2008-09-30 19:25:14 UTC (rev 1655) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewConfigurationChildResourceUIBean.java 2008-09-30 20:57:26 UTC (rev 1656) </span><span class="lines">@@ -122,6 +122,7 @@ </span><span class="cx"> } public String cancel() { </span><span class="add">+ clear(); </span><span class="cx"> return SUCCESS_OUTCOME; } </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceinventorycreateconfig2xhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-config-2.xhtml (1655 => 1656)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-config-2.xhtml 2008-09-30 19:25:14 UTC (rev 1655) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-config-2.xhtml 2008-09-30 20:57:26 UTC (rev 1656) </span><span class="lines">@@ -53,7 +53,7 @@ </span><span class="cx"> <h:commandButton value="CANCEL" immediate="true" </span><span class="rem">- action="cancel" styleClass="buttonmed"/> </span><span class="add">+ action="#{CreateNewConfigurationChildResourceUIBean.cancel}" styleClass="buttonmed"/> </span><span class="cx"> </h:panelGrid> </span> </pre> </div> </div> </body> </html> |