[Hyperic-hq-discuss] hq r14345 - in trunk/src/org/hyperic/hq: authz/shared events/server/session galerts/server/session

[<dcr...@hy...>]

Author: dcrutchf
Date: 2010-03-03 16:08:30 -0800 (Wed, 03 Mar 2010)
New Revision: 14345
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14345

Modified:
   trunk/src/org/hyperic/hq/authz/shared/AuthzConstants.java
   trunk/src/org/hyperic/hq/events/server/session/AlertDAO.java
   trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionDAO.java
   trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java
   trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java
Log:
[HQ-2072] - Group Alerts are not displayed in Recent Alert Portlet for View only user with Group Fixed/ACK permission

Modified: trunk/src/org/hyperic/hq/authz/shared/AuthzConstants.java
===================================================================
--- trunk/src/org/hyperic/hq/authz/shared/AuthzConstants.java	2010-03-03 09:22:47 UTC (rev 14344)
+++ trunk/src/org/hyperic/hq/authz/shared/AuthzConstants.java	2010-03-04 00:08:30 UTC (rev 14345)
@@ -194,7 +194,7 @@
     public static final String ResourceEdgeNetworkRelation = "network";
     
     // List of alert operations
-    public static final String[] MANAGE_ALERTS_OPS = 
+    public static final String[] VIEW_ALERTS_OPS = 
         new String[] {
             platformOpViewPlatform,
             serverOpViewServer,

Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDAO.java
===================================================================
--- trunk/src/org/hyperic/hq/events/server/session/AlertDAO.java	2010-03-03 09:22:47 UTC (rev 14344)
+++ trunk/src/org/hyperic/hq/events/server/session/AlertDAO.java	2010-03-04 00:08:30 UTC (rev 14345)
@@ -146,7 +146,7 @@
 
         if (sql.indexOf("subj") > 0) {
             q.setInteger("subj", subj.intValue())
-             .setParameterList("ops", AuthzConstants.MANAGE_ALERTS_OPS);
+             .setParameterList("ops", AuthzConstants.VIEW_ALERTS_OPS);
         }
 
         return pageInfo.pageResults(q).list();
@@ -167,7 +167,7 @@
     
         if (sql.indexOf("subj") > 0) {
             q.setInteger("subj", subj.intValue())
-             .setParameterList("ops", AuthzConstants.MANAGE_ALERTS_OPS);
+             .setParameterList("ops", AuthzConstants.VIEW_ALERTS_OPS);
         }
     
         return (Integer) q.uniqueResult();
@@ -315,7 +315,7 @@
         
         List alerts = wherePermCheck
                         .addQueryParameters(q, subject, r, 0, 
-                                Arrays.asList(AuthzConstants.MANAGE_ALERTS_OPS))
+                                Arrays.asList(AuthzConstants.VIEW_ALERTS_OPS))
                         .list();
                 
         Map lastAlerts = new HashMap(alerts.size());

Modified: trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionDAO.java
===================================================================
--- trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionDAO.java	2010-03-03 09:22:47 UTC (rev 14344)
+++ trunk/src/org/hyperic/hq/events/server/session/AlertDefinitionDAO.java	2010-03-04 00:08:30 UTC (rev 14345)
@@ -228,7 +228,7 @@
 
         return wherePermCheck
             .addQueryParameters(q, subject, r, 0,
-                                Arrays.asList(AuthzConstants.MANAGE_ALERTS_OPS)).list();
+                                Arrays.asList(AuthzConstants.VIEW_ALERTS_OPS)).list();
     }
 
     void save(AlertDefinition def) {
@@ -384,7 +384,7 @@
 
         if (sql.indexOf("subj") > 0) {
             q.setInteger("subj", subj.getId().intValue())
-             .setParameterList("ops", AuthzConstants.MANAGE_ALERTS_OPS);
+             .setParameterList("ops", AuthzConstants.VIEW_ALERTS_OPS);
         }
 
         return pInfo.pageResults(q).list();

Modified: trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java
===================================================================
--- trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java	2010-03-03 09:22:47 UTC (rev 14344)
+++ trunk/src/org/hyperic/hq/galerts/server/session/GalertLogDAO.java	2010-03-04 00:08:30 UTC (rev 14345)
@@ -146,7 +146,7 @@
                                      Integer galertDefId, PageInfo pageInfo) 
     {
         GalertLogSortField sort = (GalertLogSortField)pageInfo.getSort();
-        String op = AuthzConstants.groupOpManageAlerts;
+        String op = AuthzConstants.groupOpViewResourceGroup;
         String sql =  PermissionManagerFactory.getInstance()
                 .getGroupAlertsHQL(inEsc, notFixed, groupId, galertDefId) +
             " order by " + sort.getSortString("a", "d", "g") + 

Modified: trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java	2010-03-03 09:22:47 UTC (rev 14344)
+++ trunk/src/org/hyperic/hq/galerts/server/session/GalertManagerEJBImpl.java	2010-03-04 00:08:30 UTC (rev 14345)
@@ -447,23 +447,22 @@
                            long timeRange, long endTime, List includes) 
         throws PermissionException 
     {
-        List alerts;
-            
+        PageInfo pInfo = PageInfo.create(0, count, GalertLogSortField.DATE, false);
+        
         if (priority == EventConstants.PRIORITY_ALL) {
-            alerts = _logDAO.findByCreateTime(endTime- timeRange, endTime, 
-                                              count);
-        } else {
-            PageInfo pInfo = PageInfo.create(0, count, GalertLogSortField.DATE,
-                                             false);
-            AlertSeverity s = AlertSeverity.findByCode(priority);
-            alerts = _logDAO.findByCreateTimeAndPriority(subj.getId(),
+            // if priority is "all" set the severity code as low
+            // this is essentially "all"
+            priority = AlertSeverity.LOW.getCode();
+        }
+        
+        AlertSeverity s = AlertSeverity.findByCode(priority);
+        List alerts = _logDAO.findByCreateTimeAndPriority(subj.getId(),
                                                          endTime - timeRange,
                                                          endTime, s, false,
                                                          false, null, null,
                                                          pInfo);
-        }
-            
         List result = new ArrayList();
+
         for (Iterator i=alerts.iterator(); i.hasNext(); ) {
             GalertLog l = (GalertLog)i.next();
             GalertDef def = l.getAlertDef();