Index: openacs-4/packages/calendar-portlet/tcl/calendar-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/tcl/calendar-admin-portlet-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar-portlet/tcl/calendar-admin-portlet-procs.tcl	23 Jan 2002 05:09:37 -0000	1.2
+++ openacs-4/packages/calendar-portlet/tcl/calendar-admin-portlet-procs.tcl	25 Feb 2002 19:51:38 -0000	1.3
@@ -81,7 +81,7 @@
 			[portal::get_element_param $element_id "calendar_id"]
 		
 		set g_cal_id \
-			[portal::get_element_param $element_id "group_calendar_id"]
+			[portal::get_element_param $element_id "calendar_id"]
 
 		# don't delete the public calendar!
 		if {[calendar_public_p $calendar_id] == "f"} {
Index: openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp	19 Jan 2002 20:47:42 -0000	1.1
+++ openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.adp	25 Feb 2002 19:51:38 -0000	1.2
@@ -1,4 +1,4 @@
 
 <ul>
-<li> <a href=@url@>Create a new Event</a>
+<li> <a href=@url@?action=add&force_calendar_id=@calendar_id@>Create a new Event</a>
 </ul>
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	11 Feb 2002 19:33:57 -0000	1.3
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	25 Feb 2002 19:51:38 -0000	1.4
@@ -20,6 +20,12 @@
 }
 set list_of_calendar_ids $config(calendar_id)
 
+if {[llength $list_of_calendar_ids] > 1} {
+    set force_calendar_id [calendar_have_private_p -return_id 1 [ad_conn user_id]]
+} else {
+    set force_calendar_id [lindex $list_of_calendar_ids 0]
+}
+
 # set up some vars
 if {[empty_string_p $date]} {
     if {[empty_string_p $julian_date]} {
@@ -37,7 +43,7 @@
 if {$view == "day"} {
     set cal_stuff [calendar::one_day_display \
             -item_template {<a href=calendar/?action=edit&cal_item_id=$item_id>$item</a>} \
-            -hour_template "<a href=calendar/?date=$current_date&action=add&return_url=../&start_time=\$start_time&end_time=\$start_time>\$hour</a>" \
+            -hour_template "<a href=calendar/?date=$current_date&force_calendar_id=$force_calendar_id&action=add&return_url=../&start_time=\$start_time&end_time=\$start_time>\$hour</a>" \
             -date $current_date -start_hour 7 -end_hour 22 \
             -calendar_id_list $list_of_calendar_ids]
 } 
@@ -54,7 +60,7 @@
             -item_template {<a href=calendar/?action=edit&cal_item_id=$item_id>$item</a>} \
             -day_template "<a href=?julian_date=\$julian_date&page_num=$page_num>\$day_number</a>" \
             -date $current_date \
-            -item_add_template "<a href=calendar/?action=add&start_time=&end_time=&julian_date=\$julian_date>ADD</a>" \
+            -item_add_template "<a href=calendar/?action=add&force_calendar_id=$force_calendar_id&start_time=&end_time=&julian_date=\$julian_date>ADD</a>" \
             -calendar_id_list $list_of_calendar_ids]
 }