Index: openacs-4/packages/curriculum-central/www/stream-map.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-map.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/curriculum-central/www/stream-map.tcl 13 Feb 2006 01:30:07 -0000 1.4 +++ openacs-4/packages/curriculum-central/www/stream-map.tcl 13 Feb 2006 11:46:54 -0000 1.5 @@ -47,7 +47,8 @@ set year_session_group "${year_id}${session_id}" - set uos_details_url [export_vars -url -base uos-details {uos_id stream_id}] + set base_return_url "stream-map" + set uos_details_url [export_vars -url -base uos-details {uos_id stream_id base_return_url}] template::multirow append stream $map_id $year_id $year_name \ $session_id $session_name $core_id $uos_id $uos_code $uos_name \ Index: openacs-4/packages/curriculum-central/www/stream-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/stream-view.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/curriculum-central/www/stream-view.tcl 13 Feb 2006 01:30:07 -0000 1.1 +++ openacs-4/packages/curriculum-central/www/stream-view.tcl 13 Feb 2006 11:46:54 -0000 1.2 @@ -47,7 +47,8 @@ set year_session_group "${year_id}${session_id}" - set uos_details_url [export_vars -url -base uos-details {uos_id stream_id}] + set base_return_url "stream-view" + set uos_details_url [export_vars -url -base uos-details {uos_id stream_id base_return_url}] set core_id [curriculum_central::stream::stream_uos_relation_name \ -id $core_id] Index: openacs-4/packages/curriculum-central/www/uos-details.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/uos-details.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/curriculum-central/www/uos-details.tcl 12 Feb 2006 12:42:48 -0000 1.2 +++ openacs-4/packages/curriculum-central/www/uos-details.tcl 13 Feb 2006 11:46:54 -0000 1.3 @@ -7,10 +7,16 @@ } { uos_id:integer stream_id + {base_return_url "stream-map"} } set package_id [ad_conn package_id] +set return_view_type "[_ curriculum-central.map_view]" +if { $base_return_url eq "stream-view" } { + set return_view_type "[_ curriculum-central.overview]" +} + # Retrieve context details. db_1row context_details {} @@ -21,8 +27,8 @@ $faculty_name] \ [list [export_vars -url -base dept-streams \ {department_name department_id}] $department_name] \ - [list [export_vars -url -base stream-map \ - {stream_name stream_id}] "$stream_name - [_ curriculum-central.map_view]"] \ + [list [export_vars -url -base $base_return_url \ + {stream_name stream_id}] "$stream_name - $return_view_type"] \ $page_title] # Retrieve Unit of Study details.