Index: openacs-4/packages/assessment/www/admin/admin-request.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/admin-request.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/assessment/www/admin/admin-request.tcl 29 Jan 2005 15:27:45 -0000 1.5 +++ openacs-4/packages/assessment/www/admin/admin-request.tcl 29 Jan 2005 15:51:27 -0000 1.6 @@ -36,7 +36,7 @@ if {[exists_and_not_null assessment] && $assessment!="all"} { as::assessment::data -assessment_id $assessment set d_assessment $assessment - set new_assessment_revision $assessment_data(assessment_id) + set new_assessment_revision $assessment_data(assessment_rev_id) set assessment_query "and c.section_id_from in (select s.section_id from as_sections s, cr_revisions cr, cr_items ci, as_assessment_section_map asm where ci.item_id = cr.item_id and cr.revision_id = s.section_id and s.section_id = asm.section_id and asm.assessment_id = :new_assessment_revision)" } @@ -58,7 +58,7 @@ } if { $d_state == "ae"} { - set state_query "and al.failed_p='f' and al.approved_p='t'" + set state_query "and al.failed_p= 'f' and al.approved_p='t'" } elseif {$d_state =="f"} { set state_query "and al.approved_p='f'" } elseif {$d_state == "t"} { @@ -121,6 +121,7 @@ set query "select al.failed_p,c.inter_item_check_id,c.name,al.action_log_id,a.name as action_name,a.action_id,(select p.first_names || ' ' || p.last_name as name from persons p where p.person_id = (select subject_id from as_sessions where session_id=al.session_id))as user_name,al.session_id,c.description,al.date_requested from as_actions a, as_actions_log al, as_inter_item_checks c where al.inter_item_check_id=c.inter_item_check_id $assessment_query and c.action_p='t' $state_query and a.action_id=al.action_id $interval_query $date_query" db_multirow actions_log actions_log $query + template::list::create \ -name actions_log \ -multirow actions_log \ @@ -131,6 +132,10 @@ -bulk_action_method post \ -bulk_action_export_vars { action_log_id + d_assessment + d_state + d_interval + d_date }\ -row_pretty_plural "[_ assessment.action_log]"\ -elements { Index: openacs-4/packages/assessment/www/admin/approve-check.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/Attic/approve-check.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/assessment/www/admin/approve-check.tcl 24 Jan 2005 17:45:56 -0000 1.1 +++ openacs-4/packages/assessment/www/admin/approve-check.tcl 29 Jan 2005 15:51:37 -0000 1.2 @@ -4,6 +4,11 @@ @date 2005-01-17 } { action_log_id:multiple + d_assessment + d_state + d_interval + d_date + } set count [llength $action_log_id] @@ -16,4 +21,4 @@ as::assessment::check::manual_action_exec -inter_item_check_id $inter_item_check_id -session_id $session_id -action_log_id $log_id } -ad_returnredirect "admin-request" \ No newline at end of file +ad_returnredirect "admin-request?assessment=$d_assessment&state=$d_state&interval=$d_interval&date=$d_date" \ No newline at end of file