Index: openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl	22 Feb 2005 14:54:40 -0000	1.6
+++ openacs-4/packages/dotlrn-catalog/www/dt-admin/course-add-edit.tcl	3 Mar 2005 22:32:16 -0000	1.7
@@ -24,6 +24,7 @@
 set user_id [ad_conn user_id]
 set cc_package_id [apm_package_id_from_key "dotlrn-catalog"]
 
+
 # Check for create permissions over dotlrn-catalog package
 permission::require_permission -party_id $user_id -object_id $cc_package_id -privilege "create"
 
@@ -90,9 +91,10 @@
 ad_form -extend -name add_course -form $elements
 
 ad_form -extend -name add_course -form {
-    {category_ids:integer(category),multiple,optional
+    {category_ids:integer(multiselect),multiple,optional
 	{label "[_ dotlrn-catalog.categories]"}
 	{html {size 4}}
+	{options [dotlrn_catalog::get_categories_widget]}
 	{value "-1"}
     }
 }
@@ -140,6 +142,13 @@
     if { ![string equal $category_ids "-1"] } {
 	category::map_object -object_id $course_id $category_ids
     }
+
+    if { [string equal $return_url "course-list"] } {
+        set return_url "$return_url"
+    } else {
+        set return_url "$return_url?course_id=$course_id&course_name=$course_name&course_key=$course_key&index=$index"
+    }
+
 } -new_request {
     set context [list [list course-list "[_ dotlrn-catalog.course_list]"] "[_ dotlrn-catalog.new_course]"]
     set page_title "[_ dotlrn-catalog.new_course]"
@@ -149,7 +158,7 @@
     set page_title "[_ dotlrn-catalog.edit_course]"
     db_1row get_course_info { }
     db_string get_course_assessment { } -default "[_ dotlrn-catalog.not_associated]"
-    set return_url "$return_url?course_id=$course_id&course_name=$course_name&course_key=$course_key&index=$index"
+    set category_ids [category::get_mapped_categories $course_id]
 } -after_submit {
     ad_returnredirect "$return_url"
 }