Index: openacs-4/packages/calendar/www/view-list-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/calendar/www/view-list-display.tcl	19 Sep 2003 11:35:04 -0000	1.10
+++ openacs-4/packages/calendar/www/view-list-display.tcl	25 Sep 2003 23:11:12 -0000	1.11
@@ -6,20 +6,30 @@
 }
 
 if { ![info exists item_template] } {
+    set url_template {?sort_by=$order_by}
+}
+
+if { ![info exists item_template] } {
     set item_template "<a href=cal-item-view?cal_item_id=\$item_id>\$item</a>"
 }
 
 if { ![info exists show_calendar_name_p] } {
     set show_calendar_name_p 1
 }
 
-if {[exists_and_not_null $calendar_id_list]} {
+if { ![info exists order_by] } {
+    set order_by ""
+}
+
+if {[exists_and_not_null calendar_id_list]} {
     set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))"
 } else {
-    set calendars_clause "and (cals.package_id= :package_id or (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id)))"
+    set calendars_clause "and ((cals.package_id= :package_id and cals.private_p='f') or (cals.private_p='t' and cals.owner_id= :user_id))"
 }
-# --calendar-portlet
 
+if { ![info exists period_days] } {
+    set period_days 31
+}
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 # sort by cannot be empty
@@ -50,8 +60,9 @@
 set today_ansi_list [dt_ansi_to_list $today_date]
 set today_julian_date [dt_ansi_to_julian [lindex $today_ansi_list 0] [lindex $today_ansi_list 1] [lindex $today_ansi_list 2]]
 
-set item_type_url "view?view=list&sort_by=item_type&start_date=$start_date"
-set start_date_url "view?view=list&sort_by=start_date&start_date=$start_date"
+set item_type_url "view?view=list&sort_by=item_type&start_date=$start_date&period_days=$period_days"
+set start_date_url "view?view=list&sort_by=start_date&start_date=$start_date&period_days=$period_days"
+
 set view list
 set form_vars [export_form_vars start_date sort_by view]