Index: openacs-4/packages/calendar/www/admin/calendar-preferences-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/calendar-preferences-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/admin/calendar-preferences-postgresql.xql	28 Nov 2001 18:39:39 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/calendar-preferences-postgresql.xql	26 Jul 2003 19:33:32 -0000	1.4
@@ -15,31 +15,13 @@
  
 <fullquery name="get_viewable_calendar">      
       <querytext>
-      
-	
-	select   distinct(o.object_id) as calendar_id, 
-	         calendar__name(o.object_id) as calendar_name,
-                 calendar__show_p(o.object_id, :party_id) as show_p
-	from     acs_objects o
-	where    calendar__readable_p(o.object_id, :party_id) = 't'
-	and      party_id = :party_id
-	and      acs_object_util__object_type_p(o.object_id, 'calendar') = 't'
-	and      calendar__private_p(o.object_id) = 'f'
-	
-	union
-
-	select   cal_item__on_which_calendar(o.object_id) as calendar_id, 
-	         calendar__name(cal_item__on_which_calendar(o.object_id)) as calendar_name,
-	         calendar__show_p(cal_item__on_which_calendar(o.object_id), :party_id) as show_p
-	from     acs_objects o
-	where    privilege = 'cal_item_read'
-	and      party_id = :party_id
-	and      acs_object_util__object_type_p(o.object_id, 'cal_item') = 't'
-	and      calendar__private_p(cal_item__on_which_calendar(o.object_id)) = 'f'
-
-	
-    
-      </querytext>
+	select   calendar_id,
+	         calendar_name,
+	         calendar__show_p(calendar_id, :party_id) as show_p
+	from     calendars
+	where    acs_permission__permission_p(calendar_id, :party_id, 'calendar_read') = 't'
+        and      private_p='f'
+     </querytext>
 </fullquery>