modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
| 27 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
| 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
| 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
| 106 ++++------
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 2
6 files changed, 66 insertions(+), 81 deletions(-)
New commits:
commit 46800f7f592553f87fc735129700b421bf63a5f4
Merge: a45bdba... fe1b328...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 13:08:07 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into
track-master
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
commit a45bdba55d9aba8d28a44cadd524535a505b6ee2
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 12:58:13 2010 -0500
fix inventory title refresh issue.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
index 68314ec..890b7c0 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
@@ -288,7 +288,7 @@ public class ResourceTitleBar extends LocatableVLayout {
}
public void setResource(ResourceComposite resourceComposite) {
- if (this.resource == null || this.resource.getId() != resource.getId()) {
+ if (this.resourceComposite == null || resourceComposite.getResource().getId() !=
this.resource.getId()) {
this.resource = resourceComposite.getResource();
this.resourceComposite = resourceComposite;
update();
commit 102617182fb01beecb023b212c847ae91490ea16
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 11:23:33 2010 -0500
move tags lower in ResourceGroupTitle
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
index a81f98e..b086971 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
@@ -180,9 +180,9 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
hlayout.addMember(expandCollapseArrow);
hlayout.addMember(badge);
hlayout.addMember(title);
- hlayout.addMember(tagEditorView);
hlayout.addMember(availabilityImage);
hlayout.addMember(favoriteButton);
+ addMember(tagEditorView);
}
private void loadTags(final TagEditorView tagEditorView) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
index 0f45a31..68314ec 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
@@ -101,9 +101,8 @@ public class ResourceTitleBar extends LocatableVLayout {
//modify VLayout settings
setWidth100();
setHeight(30);
- setPadding(0);
setMembersMargin(0);
- setLayoutMargin(0);
+ setPadding(5);
}
public void update() {
commit b19bc953c65ba8bb2f0b0eddb794686933b95e39
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 11:07:41 2010 -0500
refactor to use ImageManager
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
index 3975f98..ccb2e4c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java
@@ -3,6 +3,7 @@ package org.rhq.enterprise.gui.coregui.client;
import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.GroupCategory;
/**
@@ -142,4 +143,21 @@ public class ImageManager {
return "subsystems/inventory/Connection_16.png";
}
+
+ /**
+ * Given a Boolean to indicate if something is to be considered up or down, and a
category[Cluster,Group,Platform,Server,Service]
+ * the appropriate availability icon is returned. If the given Boolean is null, the
availability will be considered down.
+ *
+ * @param Type
+ * @return the [Type] icon
+ */
+ public static String getResourceTypeIcon(ResourceType resourceType, Boolean avail) {
+ return "types/" + ((resourceType == null) ? null :
resourceType.getCategory().getDisplayName()) + "_"
+ + ((avail == null) ? "down" : (avail ? "up" :
"down")) + "_16.png";
+ }
+
+ public static String getResourceTypeLargeIcon(ResourceType resourceType, Boolean
avail) {
+ return "types/" + ((resourceType == null) ? null :
resourceType.getCategory().getDisplayName()) + "_"
+ + ((avail == null) ? "down" : (avail ? "up" :
"down")) + "_24.png";
+ }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
index 6f8b508..0f45a31 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
@@ -91,8 +91,8 @@ public class ResourceTitleBar extends LocatableVLayout {
super(locatorId);
//define two rows of content
top = new LocatableHLayout(locatorId + "_Top");
- top.setPadding(5);
- top.setMembersMargin(5);
+ top.setPadding(0);
+ top.setMembersMargin(0);
top.setHeight(30);
details = new LocatableHLayout(locatorId + "_Details");
@@ -126,7 +126,7 @@ public class ResourceTitleBar extends LocatableVLayout {
}
});
- badge = new Img("types/Service_up_24.png", 24, 24);
+ badge = new
Img(ImageManager.getResourceTypeLargeIcon(this.resource.getResourceType(), true), 24,
24);
TagEditorView tagEditorView = new
TagEditorView(extendLocatorId("TagEdit"), resource.getTags(), false,
new TagsChangedCallback() {
@@ -309,7 +309,8 @@ public class ResourceTitleBar extends LocatableVLayout {
String avail = (resource.getCurrentAvailability() != null &&
resource.getCurrentAvailability()
.getAvailabilityType() != null) ?
(resource.getCurrentAvailability().getAvailabilityType().name()
.toLowerCase()) : "down";
- badge.setSrc("types/" + category + "_" + avail +
"_24.png");
+ Boolean isAvailable = (avail.equals("down") ? Boolean.FALSE :
Boolean.TRUE);
+
badge.setSrc(ImageManager.getResourceTypeLargeIcon(this.resource.getResourceType(),
isAvailable));
markForRedraw();
}
commit 3c883290aa10d259de676a97258f4051cde5fb8d
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Tue Nov 30 09:48:36 2010 -0500
i)moved Resource Inventory Tags ui lower in ResourceTitle
ii)changed checkbox to expand/collapse icon
ii)plugin errors icon change and conditional display only when errors exist.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
index a4f9897..6f8b508 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
@@ -33,11 +33,7 @@ import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.fields.CheckboxItem;
-import com.smartgwt.client.widgets.form.fields.LinkItem;
import com.smartgwt.client.widgets.form.fields.SpacerItem;
-import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
-import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceCriteria;
@@ -56,7 +52,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.O
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.ResourceErrorsDataSource;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.ResourceErrorsView;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableImg;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -71,9 +66,14 @@ public class ResourceTitleBar extends LocatableVLayout {
private LocatableHLayout top;
//represents normally closed region of Resource details[to verbosely describe
resource across all tabs]
private LocatableHLayout details;
- private static String COMPONENT_ERROR_COUNT_MSG =
MSG.common_title_component_errors();
private static final String FAV_ICON = "Favorite_24_Selected.png";
private static final String NOT_FAV_ICON = "Favorite_24.png";
+ private static final String EXPANDED_ICON =
"[SKIN]/ListGrid/row_expanded.png";
+ private static final String COLLAPSED_ICON =
"[SKIN]/ListGrid/row_collapsed.png";
+ private static final String COLLAPSED_TOOLTIP =
MSG.view_portlet_inventory_tooltip_expand();
+ private static final String EXPANDED_TOOLTIP =
MSG.view_portlet_inventory_tooltip_collapse();
+ private static final String PLUGIN_ERRORS_ICON = "[SKIN]/Dialog/warn.png";
+ private Img expandCollapseArrow;
private Resource resource;
private ResourceComposite resourceComposite;
@@ -85,7 +85,7 @@ public class ResourceTitleBar extends LocatableVLayout {
private boolean favorite;
private LocatableHLayout detailsForm;
private OverviewForm detailsFormSummary;
- private LinkItem pluginErrors;
+ private Img pluginErrors;
public ResourceTitleBar(String locatorId) {
super(locatorId);
@@ -97,7 +97,6 @@ public class ResourceTitleBar extends LocatableVLayout {
details = new LocatableHLayout(locatorId + "_Details");
details.setWidth100();
- details.setHeight(10);//initialize to small amount of pixels
//modify VLayout settings
setWidth100();
@@ -152,10 +151,31 @@ public class ResourceTitleBar extends LocatableVLayout {
loadTags(tagEditorView);
- //creating link to put in resource title bar
- pluginErrors = new LinkItem("plugin-errors");
- pluginErrors.setTitle("");
- pluginErrors.setLinkTitle(COMPONENT_ERROR_COUNT_MSG + " (0)");
+ //add expand/collapse icon
+ expandCollapseArrow = new Img(COLLAPSED_ICON, 16, 16);
+ expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP);
+ expandCollapseArrow.setLayoutAlign(VerticalAlignment.BOTTOM);
+ expandCollapseArrow.addClickHandler(new ClickHandler() {
+ private boolean collapsed = true;
+
+ @Override
+ public void onClick(ClickEvent event) {
+ collapsed = !collapsed;
+ if (collapsed) {
+ expandCollapseArrow.setSrc(COLLAPSED_ICON);
+ expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP);
+ details.hide();
+ } else {
+ expandCollapseArrow.setSrc(EXPANDED_ICON);
+ expandCollapseArrow.setTooltip(EXPANDED_TOOLTIP);
+ details.show();
+ }
+ ResourceTitleBar.this.markForRedraw();
+ }
+ });
+
+ pluginErrors = new Img(PLUGIN_ERRORS_ICON, 24, 24);
+ pluginErrors.hide();
GWTServiceLookup.getResourceService().findResourceErrors(resourceComposite.getResource().getId(),
new AsyncCallback<List<ResourceError>>() {
public void onFailure(Throwable caught) {
@@ -165,11 +185,8 @@ public class ResourceTitleBar extends LocatableVLayout {
}
public void onSuccess(List<ResourceError> result) {
- if (result.isEmpty()) {
- pluginErrors.setLinkTitle(COMPONENT_ERROR_COUNT_MSG + "
(" + result.size() + ")");
- } else {
- pluginErrors.setLinkTitle("<font
color='red'>" + COMPONENT_ERROR_COUNT_MSG + " ("
- + result.size() + ")</font>");
+ if (!result.isEmpty()) {
+ pluginErrors.show();
}
markForRedraw();
}
@@ -177,11 +194,9 @@ public class ResourceTitleBar extends LocatableVLayout {
//define tool tip
pluginErrors.setPrompt(MSG.view_resource_title_component_errors_tooltip());
-
- //define click action to pop open detailed view of Component plugin errors
- pluginErrors.addClickHandler(new
com.smartgwt.client.widgets.form.fields.events.ClickHandler() {
+ pluginErrors.addClickHandler(new ClickHandler() {
@Override
- public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent
event) {
+ public void onClick(ClickEvent event) {
final Window winModal = new Window();
winModal.setShowMinimizeButton(false);
winModal.setShowModalMask(true);
@@ -216,54 +231,27 @@ public class ResourceTitleBar extends LocatableVLayout {
});
//top information
+ top.addMember(expandCollapseArrow);
top.addMember(badge);
top.addMember(title);
- top.addMember(tagEditorView);
- DynamicForm wrappedPluginErrors = new DynamicForm();
- wrappedPluginErrors.setFields(pluginErrors);
- top.addMember(wrappedPluginErrors);
+ top.addMember(pluginErrors);
top.addMember(availabilityImage);
top.addMember(favoriteButton);
- //detail information
- //checkbox
- final CheckboxItem displayMore = new CheckboxItem();
- final String moreDetails = MSG.common_title_show_more();
- displayMore.setName("resourceDetails");
- displayMore.setTitle(moreDetails);
- displayMore.setWidth(120);
- //conditionally expand more details section.
- displayMore.addChangeHandler(new ChangeHandler() {
- public void onChange(ChangeEvent event) {
- Boolean displayMoreDetails = (Boolean) event.getValue();
- if (displayMoreDetails) {
- detailsFormSummary.show();
- } else {
- detailsFormSummary.hide();
- }
- markForRedraw();
- }
- });
-
- //wrap checkbox for inclusion in details form.
- LocatableDynamicForm wrappedCheckbox = new
LocatableDynamicForm(extendLocatorId("Title_Bar_Checkbox"));
- wrappedCheckbox.setFields(displayMore);
detailsForm = new
LocatableHLayout(extendLocatorId("_Resource_Details"));
detailsForm.setWidth100();
detailsForm.setHeight(10);
detailsForm.setAlign(Alignment.LEFT);
- detailsForm.addMember(wrappedCheckbox);
detailsFormSummary = new
OverviewForm(extendLocatorId("Title_Optional_Summary"), resourceComposite);
detailsFormSummary.setWidth100();
- detailsFormSummary.setPadding(0);
- detailsFormSummary.setMargin(0);
+ detailsFormSummary.setPadding(3);
+ detailsFormSummary.setMargin(3);
detailsFormSummary.setLayoutAlign(Alignment.LEFT);
//condense details for display
detailsFormSummary.setHeaderEnabled(false);
detailsFormSummary.setDisplayCondensed(true);
- detailsFormSummary.hide();
detailsForm.addMember(detailsFormSummary);
SpacerItem widthSpace = new SpacerItem();
@@ -272,12 +260,13 @@ public class ResourceTitleBar extends LocatableVLayout {
wrappedSpacer.setFields(widthSpace);
detailsForm.addMember(wrappedSpacer);
details.addChild(detailsForm);
+ details.hide();
//order the components
addMember(top);
+ addMember(tagEditorView);
addMember(details);
- top.markForRedraw();
- details.markForRedraw();
+ ResourceTitleBar.this.markForRedraw();
}
private void loadTags(final TagEditorView tagEditorView) {
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 347ea5a..d181cef 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -1055,6 +1055,8 @@ view_portlet_graph_help_title = Graph Portlet~
view_portlet_graph_help_unconfigured=This graph is unconfigured, click the settings
button to configure.~
view_portlet_graph_title = Resource Graph~
view_portlet_inventory_error1=Failed to retrieve inventory summary~
+view_portlet_inventory_tooltip_expand=Click to show more details for this resource.~
+view_portlet_inventory_tooltip_collapse=Click to hide details for this resource.~
view_portlet_mashup_config_title=MashupPorlet Configuration~
view_portlet_mashup_config_title_desc=The configuration settings for the mashup
portlet.~
view_portlet_mashup_help=This portlet can include a web page via an HTTP request into an
iframe on the dashboard.~
commit eb80441a2941c118d65bb2dba58244600748c62c
Merge: f671d9f... a94e265...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Mon Nov 29 15:43:32 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into
track-master
commit f671d9fd167e40f65e6724b267e496b0312e29a6
Merge: bad2920... 59c7975...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Mon Nov 29 15:16:56 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into
track-master
Conflicts:
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
diff --cc
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
index 556437a,3384ed7..6499162
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
@@@ -20,13 -20,14 +20,11 @@@
package org.rhq.enterprise.gui.coregui.client.alert;
import java.util.Arrays;
- import java.util.Date;
-import java.util.LinkedHashMap;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.SortSpecifier;
-import com.smartgwt.client.types.MultipleAppearance;
import com.smartgwt.client.types.SortDirection;
import com.smartgwt.client.widgets.Canvas;
- import com.smartgwt.client.widgets.grid.CellFormatter;
-import com.smartgwt.client.widgets.form.fields.SelectItem;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@@ -34,8 -35,7 +32,7 @@@ import org.rhq.core.domain.alert.AlertP
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.AlertCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
- import org.rhq.enterprise.gui.coregui.client.LinkManager;
-import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
commit bad2920fd46c0a1dbc009a116d0b32215b1c5ef4
Merge: 8d72ac8... 8a2e19e...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Nov 24 13:22:17 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into
track-master
commit 8d72ac83f36b125ad8fd1edc660f542b09caed60
Merge: 0f79fdf... 64aa25b...
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Nov 24 12:43:31 2010 -0500
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into
track-master
commit 0f79fdf9772a831b4193f1075e7cbf98980be1a8
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Nov 24 12:42:51 2010 -0500
removed redundant filter form from RecentAlertsPortlet.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
index 9fd74a1..baf256d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
@@ -82,8 +82,9 @@ public class AlertHistoryView extends TableSection {
protected void configureTableFilters() {
final EnumSelectItem priorityFilter = new EnumSelectItem("severities",
MSG.view_alerts_table_filter_priority(),
AlertPriority.class);
-
- setFilterFormItems(priorityFilter);
+ if (isShowFilterForm()) {
+ setFilterFormItems(priorityFilter);
+ }
}
@Override
@@ -127,7 +128,6 @@ public class AlertHistoryView extends TableSection {
setupTableInteractions();
-
}
private void setupTableInteractions() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index d82bfd4..c25029b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -108,6 +108,7 @@ public class Table<DS extends RPCDataSource> extends
LocatableHLayout implements
private boolean showHeader = true;
private boolean showFooter = true;
private boolean showFooterRefresh = true;
+ private boolean showFilterForm = true;
private String tableTitle;
private Criteria criteria;
@@ -829,4 +830,12 @@ public class Table<DS extends RPCDataSource> extends
LocatableHLayout implements
public void setTableInfo(Label tableInfo) {
this.tableInfo = tableInfo;
}
+
+ public boolean isShowFilterForm() {
+ return showFilterForm;
+ }
+
+ public void setShowFilterForm(boolean showFilterForm) {
+ this.showFilterForm = showFilterForm;
+ }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
index a81c97f..6b12bb1 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
@@ -111,6 +111,7 @@ public class RecentAlertsPortlet extends AlertHistoryView implements
CustomSetti
setShowHeader(false);
setShowFooter(true);
setShowFooterRefresh(false); //disable footer refresh
+ setShowFilterForm(false); //disable filter form for portlet
}
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {