Index: openacs-4/packages/imsld/www/monitor-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/monitor-frame.tcl,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/imsld/www/monitor-frame.tcl 20 Jun 2006 19:20:38 -0000 1.1
+++ openacs-4/packages/imsld/www/monitor-frame.tcl 16 Nov 2007 09:44:35 -0000 1.1.4.1
@@ -16,8 +16,15 @@
set user_id [ad_conn user_id]
-db_1row monitor_service_info { *SQL* }
+ns_log Notice "role_id: $role_id"
+if { ![ string eq $role_id ""] } {
+ db_1row monitor_service_info { *SQL* }
+} else {
+ db_1row monitor_service_info_no_role_id { *SQL* }
+}
+
+
template::multirow create users_in_role role_user_id user_name
set monitoring_user_name "[_ imsld.None]"
Index: openacs-4/packages/imsld/www/monitor-frame.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/imsld/www/monitor-frame.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/imsld/www/monitor-frame.xql 20 Jun 2006 19:20:38 -0000 1.1
+++ openacs-4/packages/imsld/www/monitor-frame.xql 16 Nov 2007 09:44:35 -0000 1.1.4.1
@@ -13,10 +13,25 @@
where ims.monitor_id = :monitor_id
and cr.item_id = ims.imsld_item_id
and content_revision__is_live(cr.live_revision) = 't'
- and ims.role_id = cr2.item_id
+ and ims.role_id = cr2.item_id
+
+
+ select ims.title as monitor_service_title,
+ ims.monitor_id,
+ ims.item_id as monitor_item_id,
+ ims.self_p,
+ cr.live_revision as imsld_item_id
+ from imsld_monitor_servicesi ims, cr_items cr
+ where ims.monitor_id = :monitor_id
+ and cr.item_id = ims.imsld_item_id
+ and content_revision__is_live(cr.live_revision) = 't'
+
+
+
+