Index: openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl 6 Sep 2005 02:46:16 -0000 1.12 +++ openacs-4/packages/dotlrn-ecommerce/www/application-reject.tcl 7 Sep 2005 04:18:41 -0000 1.13 @@ -13,12 +13,18 @@ user_id:integer,notnull {type full} {send_email_p 1} - {return_url "applications"} + {return_url "applications"} + submit2:optional } -properties { } -validate { } -errors { } +if { [exists_and_equal submit2 "Reject Only"] } { + ad_returnredirect [export_vars -base application-reject { community_id user_id type return_url {send_email_p 0} }] + ad_script_abort +} + set actor_id [ad_conn user_id] set section_id [db_string section { @@ -79,6 +85,22 @@ {community_id:text(hidden)} {type:text(hidden)} {reason:text(textarea),optional {label "[_ dotlrn-ecommerce.Reason]"} {html {rows 10 cols 60}}} + } + + if { [parameter::get -parameter AllowRejectWithoutEmail] } { + ad_form \ + -extend \ + -name email_form \ + -form { + {submit1:text(submit) {label "Reject and Send Email"}} + {submit2:text(submit) {label "Reject Only"}} + } + } + + ad_form \ + -extend \ + -name email_form \ + -form { } \ -on_request { set reason [lindex [lindex [callback dotlrn::default_member_email -community_id $community_id -to_user $user_id -type "prereq reject"] 0] 2]