Index: openacs-4/packages/notifications/www/manage-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/manage-postgresql.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/notifications/www/manage-postgresql.xql	17 May 2003 10:54:55 -0000	1.5
+++ openacs-4/packages/notifications/www/manage-postgresql.xql	26 May 2007 10:43:28 -0000	1.6
@@ -5,21 +5,22 @@
 
 <fullquery name="select_notifications">      
       <querytext>
-	select request_id,
-	       type_id,
-	  (select pretty_name
-	   from notification_types
-	   where notification_types.type_id =
-	         notification_requests.type_id) as type,
-           acs_object__name(notification_requests.object_id) as object_name,
-	   (select name
-	   from notification_intervals
-	   where notification_intervals.interval_id =
-	         notification_requests.interval_id) as interval,
-	   object_id
-	from notification_requests
-	where user_id = :user_id
-        and   dynamic_p = 'f'
+     select nr.request_id,
+	    nr.type_id,
+            nt.pretty_name as type,
+            acs_object__name(nr.object_id) as object_name,
+            ni.name as interval,
+            nr.object_id
+       from notification_requests nr,
+            notification_intervals ni,
+            notification_types nt,
+            persons p
+      where nr.user_id = :user_id
+        and nr.interval_id = ni.interval_id
+        and nr.type_id = nt.type_id
+        and nr.user_id = p.person_id 
+        and nr.dynamic_p = 'f'
+      order by lower(nt.pretty_name), lower(acs_object__name(nr.object_id))
       </querytext>
 </fullquery>