modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 57 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java | 32 ++--- 3 files changed, 48 insertions(+), 43 deletions(-)
New commits: commit 2c9a0b72daaefbab9697d0a14494106a957b2dac Author: Jay Shaughnessy jshaughn@redhat.com Date: Mon Jan 16 15:47:14 2012 -0500
[Bug 769719 - resource key not HTML-escaped in search results and resource detail] Treat the key value as needing to be html escaped in the resource overview and search views. Although, it is not typically displayed in search results anyway.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java index c60236c..27db60f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java @@ -2,7 +2,7 @@ package org.rhq.enterprise.gui.coregui.client.components.table;
import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.ListGridRecord; -import org.rhq.enterprise.gui.coregui.client.ImageManager; + import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
/** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index c9210e9..a164620 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -139,38 +139,40 @@ public class ResourceSearchView extends Table { List<ListGridField> fields = createFields(); setListGridFields(fields.toArray(new ListGridField[fields.size()]));
- addTableAction(extendLocatorId("Uninventory"), MSG.common_button_uninventory(), MSG - .view_inventory_resources_uninventoryConfirm(), new ResourceAuthorizedTableAction(ResourceSearchView.this, - TableActionEnablement.ANY, Permission.DELETE_RESOURCE, new RecordExtractor<Integer>() { - - public Collection<Integer> extract(Record[] records) { - List<Integer> result = new ArrayList<Integer>(records.length); - for (Record record : records) { - result.add(record.getAttributeAsInt("id")); + addTableAction(extendLocatorId("Uninventory"), MSG.common_button_uninventory(), + MSG.view_inventory_resources_uninventoryConfirm(), new ResourceAuthorizedTableAction( + ResourceSearchView.this, TableActionEnablement.ANY, Permission.DELETE_RESOURCE, + new RecordExtractor<Integer>() { + + public Collection<Integer> extract(Record[] records) { + List<Integer> result = new ArrayList<Integer>(records.length); + for (Record record : records) { + result.add(record.getAttributeAsInt("id")); + } + + return result; } + }) {
- return result; - } - }) { - - public void executeAction(ListGridRecord[] selection, Object actionValue) { - int[] resourceIds = TableUtility.getIds(selection); - ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService(); + public void executeAction(ListGridRecord[] selection, Object actionValue) { + int[] resourceIds = TableUtility.getIds(selection); + ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService();
- resourceManager.uninventoryResources(resourceIds, new AsyncCallback<List<Integer>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_uninventoryFailed(), caught); - } + resourceManager.uninventoryResources(resourceIds, new AsyncCallback<List<Integer>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_uninventoryFailed(), + caught); + }
- public void onSuccess(List<Integer> result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_inventory_resources_uninventorySuccessful(), Severity.Info)); + public void onSuccess(List<Integer> result) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_inventory_resources_uninventorySuccessful(), Severity.Info));
- onUninventorySuccess(); - } - }); - } - }); + onUninventorySuccess(); + } + }); + } + });
setListGridDoubleClickHandler(new DoubleClickHandler() { public void onDoubleClick(DoubleClickEvent event) { @@ -226,6 +228,7 @@ public class ResourceSearchView extends Table { fields.add(nameField);
ListGridField keyField = new ListGridField(KEY.propertyName(), KEY.title(), 170); + keyField.setCellFormatter(new EscapedHtmlCellFormatter()); fields.add(keyField);
ListGridField ancestryField = AncestryUtil.setupAncestryListGridField(); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java index 3db8f68..50bf723 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java @@ -40,8 +40,8 @@ import org.rhq.core.domain.resource.composite.ResourceComposite; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.components.form.EditableFormItem; import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedDynamicForm; -import org.rhq.enterprise.gui.coregui.client.components.form.StringLengthValidator; import org.rhq.enterprise.gui.coregui.client.components.form.SimpleEditableFormItem.ValueEditedHandler; +import org.rhq.enterprise.gui.coregui.client.components.form.StringLengthValidator; import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; @@ -153,6 +153,7 @@ public class OverviewForm extends EnhancedDynamicForm { // Key StaticTextItem keyItem = new StaticTextItem(ResourceDataSourceField.KEY.propertyName(), ResourceDataSourceField.KEY.title()); + keyItem.setAttribute(OUTPUT_AS_HTML_ATTRIBUTE, true); keyItem.setValue(resource.getResourceKey()); formItems.add(keyItem);
@@ -189,8 +190,8 @@ public class OverviewForm extends EnhancedDynamicForm { public void onSuccess(Void result) { titleBar.displayResourceName(newName); CoreGUI.getMessageCenter().notify( - new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess(String - .valueOf(resource.getId()), oldName, newName), Message.Severity.Info)); + new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess( + String.valueOf(resource.getId()), oldName, newName), Message.Severity.Info)); } }); } @@ -218,8 +219,8 @@ public class OverviewForm extends EnhancedDynamicForm { OverviewForm.this.resourceService.updateResource(resource, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - MSG.view_summaryOverviewForm_error_descriptionChangeFailure(String.valueOf(resource - .getId()), oldDescription, newDescription), caught); + MSG.view_summaryOverviewForm_error_descriptionChangeFailure( + String.valueOf(resource.getId()), oldDescription, newDescription), caught); // We failed to update it on the Server, so change back the Resource and the form item to // the original value. resource.setDescription(oldDescription); @@ -227,11 +228,10 @@ public class OverviewForm extends EnhancedDynamicForm { }
public void onSuccess(Void result) { - CoreGUI.getMessageCenter() - .notify( - new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess(String - .valueOf(resource.getId()), oldDescription, newDescription), - Message.Severity.Info)); + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess( + String.valueOf(resource.getId()), oldDescription, newDescription), + Message.Severity.Info)); } }); } @@ -259,8 +259,8 @@ public class OverviewForm extends EnhancedDynamicForm { OverviewForm.this.resourceService.updateResource(resource, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { CoreGUI.getErrorHandler().handleError( - MSG.view_summaryOverviewForm_error_locationChangeFailure(String.valueOf(resource - .getId()), oldLocation, newLocation), caught); + MSG.view_summaryOverviewForm_error_locationChangeFailure( + String.valueOf(resource.getId()), oldLocation, newLocation), caught); // We failed to update it on the Server, so change back the Resource and the form item to // the original value. resource.setLocation(oldLocation); @@ -268,9 +268,11 @@ public class OverviewForm extends EnhancedDynamicForm { }
public void onSuccess(Void result) { - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess(String - .valueOf(resource.getId()), oldLocation, newLocation), Message.Severity.Info)); + CoreGUI.getMessageCenter() + .notify( + new Message(MSG.view_summaryOverviewForm_message_nameChangeSuccess( + String.valueOf(resource.getId()), oldLocation, newLocation), + Message.Severity.Info)); } }); }
rhq-commits@lists.fedorahosted.org