Index: openacs-4/packages/calendar/www/view-week-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/calendar/www/view-week-display.tcl	17 May 2004 15:15:00 -0000	1.17
+++ openacs-4/packages/calendar/www/view-week-display.tcl	16 Aug 2006 17:52:14 -0000	1.18
@@ -8,7 +8,10 @@
 }
 
 if {[info exists portlet_mode_p] && $portlet_mode_p} {
-    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ad_urlencode "../"]&action=edit&cal_item_id=\$item_id"
+    if {![info exists return_url]} {
+	set return_url [ad_urlencode "../"]
+    }
+    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=${return_url}&action=edit&cal_item_id=\$item_id"
     set url_stub_callback "calendar_portlet_display::get_url_stub"
     set page_num_formvar [export_form_vars page_num]
     set page_num_urlvar "&page_num=$page_num"
@@ -105,7 +108,7 @@
             "" \
             "" \
             "" \
-            "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" \
+            "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=&return_url=$return_url" \
             "?view=day&date=$ansi_this_date&page_num_urlvar"
     }
 
@@ -138,7 +141,7 @@
         $end_time \
         $no_time_p \
         "?view=day&date=$ansi_start_date&page_num_urlvar" \
-        "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" 
+        "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=&return_url=$return_url" 
     set current_weekday $day_of_week
 }
 
@@ -157,7 +160,7 @@
             "" \
             "" \
             "" \
-            "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=" \
+            "${base_url}cal-item-new?date=${ansi_this_date}&start_time=&end_time=&return_url=$return_url" \
             "?view=day&date=$ansi_this_date&page_num_urlvar" 
     }
 }