modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java | 3 -- modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml | 12 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-)
New commits: commit f9777c447fd56057818b69f86a11e3ca36d0c100 Author: Heiko W. Rupp pilhuhn@fedorapeople.org Date: Tue Feb 2 17:10:48 2010 +0100
Bring back the Menu entry for alert notification templates, that somehow got lost.
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml index 06c665b..cf81d77 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml @@ -481,6 +481,18 @@ </activators> </menu-item>
+ <menu-item + name="administration.systemConfiguration.notifcationTemplates" + displayName="Alert Notification Templates" + url="/rhq/resource/alert/notif/notificationTemplates.xhtml"> + <position name="administration.systemConfiguration.templates" + placement="after"/> + <activators> + <global-permission + name="MANAGE_SETTINGS"/> + </activators> + </menu-item> + <!-- Core Menu: administration.content --> <menu-item name="administration.content.contentProviders"
commit ce591d838ce5136c30d35e1cba9cdf1d5de48490 Author: Heiko W. Rupp pilhuhn@fedorapeople.org Date: Tue Feb 2 15:56:58 2010 +0100
Fix tiny error, that prevented showing the available roles
diff --git a/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java b/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java index 624f0d7..318e5a1 100644 --- a/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java +++ b/modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java @@ -102,10 +102,9 @@ public class RolesBackingBean extends CustomAlertSenderBackingBean { if (currentRoles==null) fillRolesFromAlertParameters();
- Map<String,String> ret = new HashMap<String, String>(); for (Role role : allRoles) { String roleId = String.valueOf(role.getId()); - if (currentRoles==null || currentRoles.contains(roleId)) + if (currentRoles==null || !currentRoles.contains(roleId)) rolesMap.put(role.getName(), roleId); } }
rhq-commits@lists.fedorahosted.org