Index: openacs-4/packages/assessment/www/asm-admin/admin-request.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/admin-request.tcl,v diff -u -N -r1.4.2.3 -r1.4.2.4 --- openacs-4/packages/assessment/www/asm-admin/admin-request.tcl 6 Nov 2016 11:18:13 -0000 1.4.2.3 +++ openacs-4/packages/assessment/www/asm-admin/admin-request.tcl 10 Nov 2016 15:56:58 -0000 1.4.2.4 @@ -3,10 +3,10 @@ @creation_date 2005-01-17 } { - {assessment:optional} - {interval:optional} - {date:optional} - {state:optional} + {assessment:optional ""} + {interval:optional ""} + {date:optional ""} + {state:optional ""} } -properties { context @@ -42,7 +42,7 @@ if {![acs_user::site_wide_admin_p -user_id [ad_conn user_id]]} { set permission "and c.assessment_id in (select object_id from acs_permissions where grantee_id=:party_id and privilege='admin')" } -if {([info exists assessment] && $assessment ne "") && $assessment!="all"} { +if {$assessment ne "" && $assessment ne "all"} { permission::require_permission -object_id $assessment -privilege admin as::assessment::data -assessment_id $assessment @@ -59,18 +59,18 @@ and ci.parent_id = cf.folder_id and cf.package_id = :package_id)" } -if {([info exists state] && $state ne "")} { +if {$state ne ""} { set d_state $state } -if {([info exists interval] && $interval ne "") && $interval!="all"} { +if {$interval ne "" && $interval ne "all"} { set d_interval $interval set interval_query "and date_trunc('day', al.date_requested) >= to_date('$interval','YYYY-MM-DD')" set date_query "" } -if {([info exists date] && $date ne "")} { +if {$date ne ""} { set d_date $date set date_query "and date_trunc('day', al.date_requested) = to_date('$date','YYYY-MM-DD')" set interval_query "" @@ -89,28 +89,29 @@ {assessment:text(select) {label "[_ assessment.Assessment]"} {options $assessment_list} - {html { onChange "get_assessment()"}} {value $d_assessment} } {state:text(select) {label ""} {options "$approved_options"} - {html { onChange "get_state()"}} {value $d_state} } } -has_submit 1 +template::add_event_listener -id assessment -event change -script {get_assessment();} +template::add_event_listener -id state -event change -script {get_state();} -ad_form -name interval -form { + +ad_form -name interval -form { {date:text(select) {label "[_ assessment.date_request]"} {options $intervals} {value $d_interval} - {html { onChange "get_interval()"}} } } -has_submit 1 +template::add_event_listener -id date -event change -script {get_interval();} ad_form -name specific_date_form -form { @@ -149,7 +150,7 @@ -key action_log_id\ -bulk_actions { "\#assessment.approve\#" "approve-check" "\#assessment.approve_actions\#" - "\#assessment.bulk_mail_send\#" "bulk-mail" "\#assessment.bulk_mail\#" + "\#assessment.bulk_mail_send\#" "bulk-mail" "\#assessment.bulk_mail_send\#" }\ -bulk_action_method post \ -bulk_action_export_vars {