Index: openacs-4/packages/anon-eval/catalog/anon-eval.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/anon-eval/catalog/anon-eval.en_US.ISO-8859-1.xml,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/anon-eval/catalog/anon-eval.en_US.ISO-8859-1.xml 4 Feb 2006 13:42:03 -0000 1.3
+++ openacs-4/packages/anon-eval/catalog/anon-eval.en_US.ISO-8859-1.xml 6 Feb 2006 16:02:25 -0000 1.4
@@ -7,6 +7,7 @@
Evaluations Administration
Answered Evaluations
Anonymous Evaluations
+ Display Admin Sessions
Open Evaluations
You don't have permission to see the results.
Show Evaluations
Index: openacs-4/packages/anon-eval/www/assessment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/anon-eval/www/assessment.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/anon-eval/www/assessment.tcl 4 Feb 2006 13:42:03 -0000 1.3
+++ openacs-4/packages/anon-eval/www/assessment.tcl 6 Feb 2006 16:02:25 -0000 1.4
@@ -49,11 +49,14 @@
set assessment_rev_id $assessment_data(assessment_rev_id)
-if {[empty_string_p $session_id]} {
+# Don't check for conditions for admin, admin can test the assessment
+if { [empty_string_p $session_id] && ! $admin_p } {
set errors [as::assessment::check_session_conditions -assessment_id $assessment_rev_id -subject_id $user_id -password $password]
if {![empty_string_p $errors]} {
- ad_return_complaint 1 $errors
- ad_script_abort
+ if {
+ ad_return_complaint 1 $errors
+ ad_script_abort
+ }
}
}
Index: openacs-4/packages/anon-eval/www/sessions-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/anon-eval/www/sessions-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/anon-eval/www/sessions-postgresql.xql 2 Jun 2005 06:28:45 -0000 1.1
+++ openacs-4/packages/anon-eval/www/sessions-postgresql.xql 6 Feb 2006 16:02:25 -0000 1.2
@@ -18,6 +18,7 @@
AND s.subject_id = :subject_id
AND r.item_id = :assessment_id
and a.assessment_id = :assessment_rev_id
+ [template::list::filter_where_clauses -and -name sessions]
ORDER BY s.session_id desc
@@ -36,6 +37,7 @@
AND s.subject_id = p.person_id
AND r.item_id = :assessment_id
and a.assessment_id = :assessment_rev_id
+ [template::list::filter_where_clauses -and -name sessions]
ORDER BY s.session_id desc
Index: openacs-4/packages/anon-eval/www/sessions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/anon-eval/www/sessions.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/anon-eval/www/sessions.adp 2 Jun 2005 06:28:45 -0000 1.1
+++ openacs-4/packages/anon-eval/www/sessions.adp 6 Feb 2006 16:02:25 -0000 1.2
@@ -2,4 +2,5 @@
@page_title;noquote@
@context_bar;noquote@
+
Index: openacs-4/packages/anon-eval/www/sessions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/anon-eval/www/sessions.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/anon-eval/www/sessions.tcl 9 Jun 2005 05:54:36 -0000 1.2
+++ openacs-4/packages/anon-eval/www/sessions.tcl 6 Feb 2006 16:02:25 -0000 1.3
@@ -9,6 +9,7 @@
} {
assessment_id:notnull
{subject_id:integer,optional ""}
+ admin_sessions:optional
} -properties {
context_bar:onevalue
page_title:onevalue
@@ -20,6 +21,7 @@
set user_id [ad_conn user_id]
permission::require_permission -object_id $assessment_id -privilege read
set dotlrn_admin_p [dotlrn::admin_p]
+set package_id [ad_conn package_id]
if { !$dotlrn_admin_p } {
ad_return_complaint 1 "[_ anon-eval.permission_denied]"
@@ -90,7 +92,26 @@
}
} -main_class {
narrow
- }
+ } \
+ -filters {
+ assessment_id {}
+ subject_id {}
+ admin_sessions {
+ label "[_ anon-eval.lt_Display_Admin_Session]"
+ values {
+ {"[_ acs-subsite.Show]" "show"}
+ {"[_ acs-subsite.Hide]" "hide"}
+ }
+ where_clause {
+ (case when :admin_sessions = 'hide'
+ then not s.subject_id in (select grantee_id
+ from acs_permissions_all
+ where privilege = 'admin'
+ and object_id = :package_id)
+ else true end)
+ }
+ }
+ }
}