Index: openacs-4/packages/assessment/www/asm-admin/approve-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/approve-check.tcl,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/assessment/www/asm-admin/approve-check.tcl 10 Sep 2015 08:28:02 -0000 1.3.2.1
+++ openacs-4/packages/assessment/www/asm-admin/approve-check.tcl 4 Jul 2016 11:23:05 -0000 1.3.2.2
@@ -20,8 +20,8 @@
for { set i 0} { $i< $count } {incr i} {
set log_id [lindex $action_log_id $i]
- set inter_item_check_id [db_string get_check_id {select inter_item_check_id from as_actions_log where action_log_id=:log_id}]
- set session_id [db_string get_session_id {select session_id from as_actions_log where action_log_id=:log_id}]
+ set inter_item_check_id [db_string get_check_id {select inter_item_check_id from as_actions_log where action_log_id=:log_id}]
+ set session_id [db_string get_session_id {select session_id from as_actions_log where action_log_id=:log_id}]
as::assessment::check::manual_action_exec -inter_item_check_id $inter_item_check_id -session_id $session_id -action_log_id $log_id
Index: openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl 10 Sep 2015 08:28:03 -0000 1.10.2.1
+++ openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl 4 Jul 2016 11:23:05 -0000 1.10.2.2
@@ -29,7 +29,7 @@
set item_id_check $item_id
set as_item_id_i [db_string get_item_id { select item_id from cr_revisions where revision_id = :item_id}]
set check_list "and c.inter_item_check_id in ("
- set checks [db_list_of_lists get_all_checks { }]
+ set checks [db_list_of_lists get_all_checks {}]
set count 0
foreach check $checks {
Index: openacs-4/packages/assessment/www/asm-admin/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index-oracle.xql,v
diff -u -r1.1 -r1.1.14.1
--- openacs-4/packages/assessment/www/asm-admin/index-oracle.xql 1 Feb 2005 22:00:10 -0000 1.1
+++ openacs-4/packages/assessment/www/asm-admin/index-oracle.xql 4 Jul 2016 11:23:05 -0000 1.1.14.1
@@ -16,4 +16,18 @@
+
+
+
+ select ci.item_id as assessment_id, cr.title, ci.publish_status
+ from cr_items ci, cr_revisions cr
+ where cr.revision_id = ci.latest_revision
+ and ci.content_type = 'as_assessments'
+ and ci.parent_id = :folder_id
+ and acs_permission.permission_p(ci.item_id, :user_id, 'admin')
+ order by cr.title
+
+
+
+
Index: openacs-4/packages/assessment/www/asm-admin/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index-postgresql.xql,v
diff -u -r1.1 -r1.1.14.1
--- openacs-4/packages/assessment/www/asm-admin/index-postgresql.xql 1 Feb 2005 22:00:10 -0000 1.1
+++ openacs-4/packages/assessment/www/asm-admin/index-postgresql.xql 4 Jul 2016 11:23:05 -0000 1.1.14.1
@@ -16,5 +16,18 @@
+
+
+
+ select ci.item_id as assessment_id, cr.title, ci.publish_status
+ from cr_items ci, cr_revisions cr
+ where cr.revision_id = ci.latest_revision
+ and ci.content_type = 'as_assessments'
+ and ci.parent_id = :folder_id
+ and acs_permission__permission_p(ci.item_id, :user_id, 'admin')
+ order by cr.title
+
+
+
Fisheye: Tag 1.5.8.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/index.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/assessment/www/asm-admin/request-notification.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/request-notification.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/assessment/www/asm-admin/request-notification.tcl 10 Sep 2015 08:28:07 -0000 1.4.2.1
+++ openacs-4/packages/assessment/www/asm-admin/request-notification.tcl 4 Jul 2016 11:23:05 -0000 1.4.2.2
@@ -93,7 +93,7 @@
label "[_ notifications.Delivery_Method]"
}
}
-db_multirow notify_users notify_users { *SQL* }
+db_multirow notify_users notify_users {}
# Local variables:
# mode: tcl
Index: openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql,v
diff -u -r1.4.6.1 -r1.4.6.2
--- openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql 26 Sep 2015 11:26:54 -0000 1.4.6.1
+++ openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql 4 Jul 2016 11:23:05 -0000 1.4.6.2
@@ -20,13 +20,10 @@
where a.assessment_id = cr.revision_id
and cr.revision_id = ci.latest_revision
and ci.parent_id = :folder_id
- and u.user_id <> 0
- and exists (
- select 1 from acs_object_party_privilege_map
- where object_id = :assessment_id
- and party_id = u.user_id
- and privilege = 'read')
- and acs_group__member_p(u.user_id, :group_id, 't')) a
+ and u.user_id <> 0
+ and acs_permission__permission_p(:assessment_id, u.user_id, 'read')
+ and acs_group__member_p(u.user_id, :group_id, 't')
+ ) a
left join (select as_sessions.*, cr.item_id
from as_sessions, cr_revisions cr
where session_id in (select max(session_id)
Index: openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql,v
diff -u -r1.2 -r1.2.8.1
--- openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql 7 Oct 2007 22:36:54 -0000 1.2
+++ openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql 4 Jul 2016 11:23:05 -0000 1.2.8.1
@@ -37,10 +37,8 @@
parties.party_id <> 0
and parties.party_id = users.user_id
and parties.party_id = acs_objects.object_id
- and exists (select 1 from acs_object_party_privilege_map m
- where m.object_id = $assessment_id
- and m.party_id = parties.party_id
- and m.privilege = 'read')
+ and acs_permission__permission_p(:assessment_id, parties.party_id, 'read')
+
@@ -82,7 +80,7 @@
from as_sessions s, cr_revisions r
where s.assessment_id = r.revision_id
and s.completed_datetime is not null
- and r.item_id = $assessment_id)
+ and r.item_id = :assessment_id)
@@ -127,11 +125,9 @@
from as_sessions s, cr_revisions r
where s.assessment_id = r.revision_id
and s.completed_datetime is not null
- and r.item_id = $assessment_id)
- and exists (select 1 from acs_object_party_privilege_map m
- where m.object_id = $assessment_id
- and m.party_id = parties.party_id
- and m.privilege = 'read')
+ and r.item_id = :assessment_id)
+ and acs_permission__permission_p(:assessment_id, parties.party_id, 'read')
+
@@ -148,7 +144,7 @@
from as_sessions s, cr_revisions r
where s.assessment_id = r.revision_id
and s.completed_datetime is not null
- and r.item_id = $assessment_id)
+ and r.item_id = :assessment_id)
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/sessions-oracle.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/sessions-postgresql.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2.8.1 refers to a dead (removed) revision in file `openacs-4/packages/assessment/www/asm-admin/sessions.xql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/assessment/www/asm-admin/unsubscribe.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/unsubscribe.tcl,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/assessment/www/asm-admin/unsubscribe.tcl 10 Sep 2015 08:28:09 -0000 1.3.2.1
+++ openacs-4/packages/assessment/www/asm-admin/unsubscribe.tcl 4 Jul 2016 11:23:05 -0000 1.3.2.2
@@ -20,7 +20,7 @@
for { set i 0} { $i < $request_count } { incr i } {
db_transaction {
set r_id [lindex $request_id $i]
- db_dml remove_notify { *SQL* }
+ db_dml remove_notify {}
}
}