Index: openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl	4 Feb 2005 23:05:53 -0000	1.3
+++ openacs-4/packages/courses/www/cc-admin/dotlrn-list.tcl	8 Feb 2005 23:07:53 -0000	1.4
@@ -12,19 +12,20 @@
 
 set page_title "[_ courses.dotlrn_list]"
 if {[string equal $return_url ""]} {
-    set return_url "/courses/cc-admin/courses-list"
+    set return_url "courses-list"
 }
-set user_id [auth::get_user_id]
+set user_id [ad_conn user_id]
 
 # Check if users has admin permission to edit course_catalog
 permission::require_permission -party_id $user_id -object_id $course_id -privilege "admin"
 
-set context [list [list "/courses/cc-admin/course-list"  "[_ courses.course_list]"] "[_ courses.dotlrn_list]"]
+set context [list [list course-list  "[_ courses.course_list]"] "[_ courses.dotlrn_list]"]
 
 set asm_package_id [apm_package_id_from_key assessment]
 
-db_multirow -extend { rel } classes_list get_dotlrn_classes {} {
-    set rel [course_catalog::has_relation -course_id $object_id]
+db_multirow -extend { rel type } classes_list get_dotlrn_classes {} {
+    set rel [course_catalog::relation_between -object_one $course_id -object_two $object_id]
+    set type "class"
 }
 
 template::list::create \
@@ -36,6 +37,7 @@
     -bulk_action_method post \
     -bulk_action_export_vars {
 	course_id
+	type
     }\
     -row_pretty_plural "[_ courses.dotlrn_classes]" \
     -elements {
@@ -81,7 +83,7 @@
 	associate {
 	    display_template {
 		<if @classes_list.rel@ eq 0>
-		<a href="associate-course?course_id=$course_id&object_id=@classes_list.object_id@&return_url=$return_url" title="\#courses.associate_to_class\#\">#courses.associate#</a>
+		<a href="associate-course?course_id=$course_id&object_id=@classes_list.object_id@&return_url=$return_url&type=@classes_list.type@" title="\#courses.associate_to_class\#\">#courses.associate#</a>
 		</if>
 		<else>
 		#courses.associated#
@@ -90,8 +92,9 @@
 	}
     }
 
-db_multirow -extend { rel } com_list get_dotlrn_communities { } {
-    set rel [course_catalog::com_has_relation -community_id $object_id]
+db_multirow -extend { rel type } com_list get_dotlrn_communities { } {
+    set rel [course_catalog::relation_between -object_one $course_id -object_two $object_id]
+    set type "community"
 }
 
 template::list::create \
@@ -103,8 +106,9 @@
     -bulk_action_method post \
     -bulk_action_export_vars {
 	course_id
+	type
     }\
-    -row_pretty_plural "[_ courses.dotlrn_classes]" \
+    -row_pretty_plural "[_ courses.dotlrn_com]" \
     -elements {
 	check_box {
 	    class "list-narrow"
@@ -129,7 +133,7 @@
 	associate {
 	    display_template {
 		<if @com_list.rel@ eq 0>
-	  	   <a href="associate-course?course_id=$course_id&object_id=@com_list.object_id@&return_url=$return_url" title="\#courses.associate_to_class\#\">#courses.associate#</a>
+	  	   <a href="associate-course?course_id=$course_id&object_id=@com_list.object_id@&return_url=$return_url&type=@com_list.type@" title="\#courses.associate_to_class\#\">#courses.associate#</a>
 		</if>
 		<else>
 		#courses.associated#