Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -N -r1.26.2.1 -r1.26.2.2
--- openacs-4/packages/calendar/www/cal-item-new.tcl	19 Jun 2005 07:49:35 -0000	1.26.2.1
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	23 Jun 2005 12:38:05 -0000	1.26.2.2
@@ -15,7 +15,7 @@
     {start_time ""}
     {end_time ""}
     {view "month"}
-    {return_url ""}
+    {return_url "cal-item-view"}
 }
 auth::require_login
 
@@ -51,14 +51,13 @@
     set ad_form_mode edit
 }
 
-ad_form -name cal_item  -form {
+ad_form -name cal_item  -export { return_url } -form {
     {cal_item_id:key}
 
     {title:text(text)
         {label "[_ calendar.Title_1]"}
         {html {size 45} maxlength 255}
     }
-    {return_url:text(hidden)}
     {date:date
         {label "[_ calendar.Date_1]"}
 	{format "Month DD YYYY"}
@@ -245,11 +244,7 @@
     if {$repeat_p} {
         ad_returnredirect [export_vars -base cal-item-create-recurrence { cal_item_id return_url}]
     } else {
-	if {![empty_string_p $return_url]} {
-	    ad_returnredirect $return_url
-	} else {
-	    ad_returnredirect [export_vars -base cal-item-view { cal_item_id }]
-	}
+        ad_returnredirect [export_vars -base $return_url { cal_item_id }]
    }
     ad_script_abort
 
@@ -287,11 +282,7 @@
         -edit_all_p $edit_all_p \
         -calendar_id $calendar_id
     
-    if {![empty_string_p $return_url]} {
-	ad_returnredirect $return_url
-    } else {
-	ad_returnredirect [export_vars -base cal-item-view { cal_item_id }]
-    }
+    ad_returnredirect [export_vars -base $return_url { cal_item_id }]
     ad_script_abort
 }