Attachment 388179 Details for Bug 560859 – PoC patch

[patch] PoC patch

alertdef-disable-multiple.diff (text/plain), 5.77 KB, created by James Livingston on 2010-02-02 02:13:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Livingston

Created: 2010-02-02 02:13:38 UTC

Size: 5.77 KB

patch

obsolete

>Index: modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java
>===================================================================
>--- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java	(revision 5246)
>+++ modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java	(working copy)
>@@ -167,6 +167,84 @@
>         return "success";
>     }
> 
>+    public String disableSelected() {
>+        Integer[] selected = getSelectedItems();
>+
>+        try {
>+            Subject subject = getSubject();
>+
>+            List<Integer> resourceDefinitions = new ArrayList<Integer>();
>+            List<Integer> groupDefinitions = new ArrayList<Integer>();
>+            List<Integer> typeDefinitions = new ArrayList<Integer>();
>+
>+            for (Integer definitionId : selected) {
>+                if (alertDefinitionManager.isTemplate(definitionId)) {
>+                    typeDefinitions.add(definitionId);
>+                } else if (alertDefinitionManager.isGroupAlertDefinition(definitionId)) {
>+                    groupDefinitions.add(definitionId);
>+                } else {
>+                    resourceDefinitions.add(definitionId);
>+                }
>+            }
>+
>+            // delete resources first
>+            alertDefinitionManager.disableAlertDefinitions(subject, resourceDefinitions
>+                .toArray(new Integer[resourceDefinitions.size()]));
>+
>+            // then delete templates and group alert defs, which are both tolerant of missing child definitions
>+            groupAlertDefinitionManager.disableGroupAlertDefinitions(subject, groupDefinitions
>+                .toArray(new Integer[groupDefinitions.size()]));
>+            alertTemplateManager.removeAlertTemplates(subject, typeDefinitions.toArray(new Integer[typeDefinitions
>+                .size()]));
>+
>+            FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Disable selected alert definitions.");
>+        } catch (Exception e) {
>+            FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to disable selected alert definitions.",
>+                e);
>+        }
>+
>+        return "success";
>+    }
>+
>+    public String enableSelected() {
>+        Integer[] selected = getSelectedItems();
>+
>+        try {
>+            Subject subject = getSubject();
>+
>+            List<Integer> resourceDefinitions = new ArrayList<Integer>();
>+            List<Integer> groupDefinitions = new ArrayList<Integer>();
>+            List<Integer> typeDefinitions = new ArrayList<Integer>();
>+
>+            for (Integer definitionId : selected) {
>+                if (alertDefinitionManager.isTemplate(definitionId)) {
>+                    typeDefinitions.add(definitionId);
>+                } else if (alertDefinitionManager.isGroupAlertDefinition(definitionId)) {
>+                    groupDefinitions.add(definitionId);
>+                } else {
>+                    resourceDefinitions.add(definitionId);
>+                }
>+            }
>+
>+            // delete resources first
>+            alertDefinitionManager.enableAlertDefinitions(subject, resourceDefinitions
>+                .toArray(new Integer[resourceDefinitions.size()]));
>+
>+            // then delete templates and group alert defs, which are both tolerant of missing child definitions
>+            groupAlertDefinitionManager.enableGroupAlertDefinitions(subject, groupDefinitions
>+                .toArray(new Integer[groupDefinitions.size()]));
>+            alertTemplateManager.removeAlertTemplates(subject, typeDefinitions.toArray(new Integer[typeDefinitions
>+                .size()]));
>+
>+            FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Enable selected alert definitions.");
>+        } catch (Exception e) {
>+            FacesContextUtility.addMessage(FacesMessage.SEVERITY_ERROR, "Failed to enable selected alert definitions.",
>+                e);
>+        }
>+
>+        return "success";
>+    }
>+
>     @Override
>     public DataModel getDataModel() {
>         if (dataModel == null) {
>@@ -240,4 +318,4 @@
>             return null;
>         }
>     }
>-}
>\ No newline at end of file
>+}
>Index: modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml
>===================================================================
>--- modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml	(revision 5246)
>+++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml	(working copy)
>@@ -217,6 +217,12 @@
>                         <onc:selectCommandButton action="#{SubsystemAlertDefinitionUIBean.deleteSelected}"
>                                                  value="DELETE SELECTED" target="selectedItems" styleClass="on-pager-button buttonsmall"
>                                                  rendered="#{GlobalPermissionsUIBean.superuser}" />
>+                        <onc:selectCommandButton action="#{SubsystemAlertDefinitionUIBean.disableSelected}"
>+                                                 value="DISABLE SELECTED" target="selectedItems" styleClass="on-pager-button buttonsmall"
>+                                                 rendered="#{GlobalPermissionsUIBean.superuser}" />
>+                        <onc:selectCommandButton action="#{SubsystemAlertDefinitionUIBean.enableSelected}"
>+                                                 value="ENABLE SELECTED" target="selectedItems" styleClass="on-pager-button buttonsmall"
>+                                                 rendered="#{GlobalPermissionsUIBean.superuser}" />
> 
>                         <ui:param name="paginationDataTableName" value="alertDefinitionDataTable"/>
>                         <ui:param name="paginationDataModel" value="#{alertDefinitionDataModel}"/>
>

Actions: View | Diff

Attachments on bug 560859: 388179