Index: openacs-4/packages/imsld/lib/activity-resource.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity-resource.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/lib/activity-resource.tcl	5 Mar 2009 16:22:59 -0000	1.2
+++ openacs-4/packages/imsld/lib/activity-resource.tcl	3 Jun 2009 14:15:08 -0000	1.3
@@ -33,7 +33,7 @@
 
     set file_url [acs_sc::invoke -contract FtsContentProvider -operation url -impl $object_type -call_args [list $acs_object_id]]
 
-    set href [export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id}]
+    set href [export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url resource_item_id run_id activity_id}]
     set img_src [imsld::object_type_image_path -object_type $object_type]
 
 } elseif { [string eq $resource_type "imsldcontent"] } {
@@ -70,7 +70,7 @@
 	}
 
 	set file_url "imsld-content-serve"
-	set href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id}]"
+	set href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url resource_item_id run_id activity_id}]"
 
 	multirow append files $href $file_name
 
@@ -108,7 +108,7 @@
 	    set fs_file_url [db_1row get_fs_file_url { *SQL* }]
 	    set file_url "[apm_package_url_from_id $fs_package_id]view/${file_url}"
 	}
-	set href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url $file_url resource_item_id $resource_item_id run_id $run_id}]"
+	set href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" {file_url resource_item_id run_id activity_id}]"
 	set img_src "[imsld::object_type_image_path -object_type file-storage]"
 
 	multirow append files $href $file_name $img_src
@@ -117,7 +117,7 @@
     # get associated urls
     
     db_foreach associated_urls { *SQL* } {
-	set href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" { {file_url "[export_vars -base $url]"} resource_item_id run_id}]"
+	set href "[export_vars -base "[lindex [site_node::get_url_from_object_id -object_id $imsld_package_id] 0]imsld-finish-resource" { {file_url "[export_vars -base $url]"} resource_item_id run_id activity_id}]"
 	set img_src "[imsld::object_type_image_path -object_type url]"
 	
 	multirow append files $href $url $img_src	
Index: openacs-4/packages/imsld/lib/activity-resources-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity-resources-list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/imsld/lib/activity-resources-list.adp	18 Feb 2009 19:01:13 -0000	1.1
+++ openacs-4/packages/imsld/lib/activity-resources-list.adp	3 Jun 2009 14:15:08 -0000	1.2
@@ -1,10 +1,10 @@
-<if @has_items@>
+<if @resources:rowcount@ gt 1>
     <ul>
       <multiple name="resources">
 
         <include src="activity-resource"
         resource_item_id="@resources.resource_item_id@" run_id="@run_id@"
-        li_mode_p="t" monitor_p="@monitor_p@" />
+        li_mode_p="t" monitor_p="@monitor_p@" activity_id="@activity_id@" />
 
       </multiple>
     </ul>
Index: openacs-4/packages/imsld/lib/activity-resources-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity-resources-list.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/lib/activity-resources-list.tcl	5 Mar 2009 16:22:59 -0000	1.2
+++ openacs-4/packages/imsld/lib/activity-resources-list.tcl	3 Jun 2009 14:15:08 -0000	1.3
@@ -5,13 +5,11 @@
 }
 
 set linear_item_list [db_list item_linear_list { *SQL* }]
-set has_items 0
 
 multirow create resources resource_item_id
 
 foreach imsld_item_id $linear_item_list {
     foreach sa_items_list [db_list_of_lists la_nested_associated_items { *SQL* }] {
-	set has_items 1
 	set resource_id [lindex $sa_items_list 0]
 	set resource_item_id [lindex $sa_items_list 1]
 	set resource_type [lindex $sa_items_list 2]
Index: openacs-4/packages/imsld/lib/activity.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/lib/activity.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/imsld/lib/activity.adp	27 Apr 2009 09:55:30 -0000	1.2
+++ openacs-4/packages/imsld/lib/activity.adp	3 Jun 2009 14:15:08 -0000	1.3
@@ -18,7 +18,7 @@
         </if>
       </else>
       <include src="activity-resources-list" activity_item_id="@activity_item_id@"
-        run_id="@run_id@" user_id="@user_id@" />
+        run_id="@run_id@" user_id="@user_id@" activity_id="@activity_id@" />
     </li>
   </case>
 
@@ -41,7 +41,7 @@
         </if>
       </else>
       <include src="activity-resources-list" activity_item_id="@activity_item_id@"
-        run_id="@run_id@" user_id="@user_id@" />
+        run_id="@run_id@" user_id="@user_id@" activity_id="@activity_id@" />
     </li>
   </case>