Index: openacs-4/packages/imsld/tcl/imsld-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.tcl,v
diff -u -N -r1.79 -r1.80
--- openacs-4/packages/imsld/tcl/imsld-procs.tcl	19 Jul 2006 15:30:13 -0000	1.79
+++ openacs-4/packages/imsld/tcl/imsld-procs.tcl	20 Jul 2006 08:48:53 -0000	1.80
@@ -1333,9 +1333,7 @@
         conference {
             db_1row get_conference_info { *SQL* }
             db_foreach serv_associated_items { *SQL* } {
-                if {[string eq "t" $resource_mode]} {
-                    lappend resource_item_list $resource_item_id
-                }
+                lappend resource_item_list $resource_item_id
                 imsld::process_resource_as_ul -resource_item_id $resource_item_id \
                     -run_id $run_id \
                     -dom_node $dom_node \
@@ -1357,6 +1355,7 @@
         send-mail {
             # FIX ME: when roles are supported, fix this so the mail is sent to the propper role
             set resource_item_list [list]
+
             db_1row get_send_mail_info { *SQL* }
 
             set send_mail_node_li [$dom_doc createElement li]
@@ -1373,6 +1372,9 @@
         monitor {
             set resource_item_list [list]
             db_1row monitor_service_info { *SQL* }
+            db_foreach monitor_associated_items { *SQL* } {
+                lappend resource_item_list $resource_item_id
+            }
 
             set monitor_node_li [$dom_doc createElement li]
             set a_node [$dom_doc createElement a]
@@ -1392,7 +1394,7 @@
     }
     
     #grant permissions for resources in service
-    imsld::grant_permissions -resources_activities_list $resource_item_id -user_id [ad_conn user_id]
+    imsld::grant_permissions -resources_activities_list $resource_item_list -user_id [ad_conn user_id]
 
     if {[string eq "t" $resource_mode]} {
         return [list $services_list $resource_item_list]
Index: openacs-4/packages/imsld/tcl/imsld-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/tcl/imsld-procs.xql,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/imsld/tcl/imsld-procs.xql	10 Jul 2006 13:15:14 -0000	1.27
+++ openacs-4/packages/imsld/tcl/imsld-procs.xql	20 Jul 2006 08:48:53 -0000	1.28
@@ -1022,8 +1022,7 @@
 		</querytext>
 	</fullquery>
 
-
-	<fullquery name="imsld::process_service_as_ul.monitor_associated_item">
+	<fullquery name="imsld::process_service_as_ul.monitor_associated_items">
 		<querytext>
 
                 select cpr.resource_id,
Index: openacs-4/packages/imsld/www/activity-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/activity-frame.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/imsld/www/activity-frame.tcl	19 Jul 2006 15:30:13 -0000	1.9
+++ openacs-4/packages/imsld/www/activity-frame.tcl	20 Jul 2006 08:48:54 -0000	1.10
@@ -1,4 +1,4 @@
-# packages/imsld/www/activity-frameset.tcl
+# packages/imsld/www/activity-frame.tcl
 
 ad_page_contract {
 
@@ -68,17 +68,16 @@
 set activity_item_id [content::revision::item_id -revision_id $activity_id]
 imsld::process_activity_as_ul -activity_item_id $activity_item_id -run_id $run_id -dom_doc $doc -dom_node $dom_root
 
-    if {![string eq $activity_id ""] } {
-    db_1row get_table_name {
-        select 
-               case 
-               when exists (select 1 from imsld_learning_activities where activity_id=:activity_id) 
-               then 'imsld_learning_activities' 
-               when exists (select 1 from imsld_support_activities where activity_id=:activity_id) 
-               then 'imsld_support_activities' 
-               end as table_name 
-        from dual
-    }
+if { ![string eq $activity_id ""] && [db_0or1row get_table_name {
+    select 
+    case 
+    when exists (select 1 from imsld_learning_activities where activity_id=:activity_id) 
+    then 'imsld_learning_activities' 
+    when exists (select 1 from imsld_support_activities where activity_id=:activity_id) 
+    then 'imsld_support_activities' 
+    end as table_name 
+    from dual
+}] && ![string eq "" $table_name] } {
     #grant permissions to resources in activity
     set resources_list [db_list get_resources_from_activity "
                         select ar2.object_id_two 
@@ -91,7 +90,8 @@
                         and ar1.object_id_two=ar2.object_id_one 
                         and ar2.rel_type='imsld_item_res_rel'
     "]
-    set prerequisites_list [db_list get_prerequisites_list "
+    if { [string eq "imsld_learning_activities" $table_name] } {
+        set prerequisites_list [db_list get_prerequisites_list "
                        select ar2.object_id_two 
                        from acs_rels ar1, 
                             acs_rels ar2, 
@@ -102,7 +102,7 @@
                              and ar1.object_id_two=ar2.object_id_one 
                              and ar2.rel_type='imsld_item_res_rel' 
     "]
-    set objectives_list [db_list get_objectives_list "
+        set objectives_list [db_list get_objectives_list "
                        select ar2.object_id_two 
                        from acs_rels ar1, 
                             acs_rels ar2, 
@@ -113,9 +113,10 @@
                              and ar1.object_id_two=ar2.object_id_one 
                              and ar2.rel_type='imsld_item_res_rel'
     "]
-    set resources_list [concat $resources_list [concat $prerequisites_list $objectives_list]]
-    imsld::grant_permissions -resources_activities_list $resources_list -user_id $user_id      
+        set resources_list [concat $resources_list [concat $prerequisites_list $objectives_list]]
     }
+    imsld::grant_permissions -resources_activities_list $resources_list -user_id $user_id      
+}
 
 set activities [$dom_root asXML]