Index: openacs-4/packages/dotlrn-ecommerce/www/applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/applications.tcl,v
diff -u -r1.41 -r1.42
--- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 23 Jan 2006 08:04:42 -0000 1.41
+++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl 16 Feb 2006 20:30:54 -0000 1.42
@@ -43,6 +43,7 @@
}
set filters {
+ {"[_ dotlrn-ecommerce.Already_Registered]" "approved"}
{"[_ dotlrn-ecommerce.In_Waiting_List]" "needs approval"}
{"[_ dotlrn-ecommerce.lt_Approved_Waiting_List]" "waitinglist approved"}
{"[_ dotlrn-ecommerce.For_PreReq_Approval]" "request approval"}
@@ -117,6 +118,9 @@
[_ dotlrn-ecommerce.lt_User_has_approved_pre]
+
+ [_ dotlrn-ecommerce.lt_User_is_already_regis_1]
+
[_ dotlrn-ecommerce.lt_User_has_submitted_an]
@@ -168,12 +172,12 @@
[_ dotlrn-ecommerce.Approve]
[_ dotlrn-ecommerce.Reject]
-
+
[_ dotlrn-ecommerce.Cancel]
[_ dotlrn-ecommerce.Register]
-
+
}
html { width 125 align center nowrap }
}
@@ -238,9 +242,9 @@
}
if { $enable_applications_p } {
- set member_state_clause { and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved', 'application sent', 'application approved') }
+ set member_state_clause { and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved', 'application sent', 'application approved', 'approved') }
} else {
- set member_state_clause { and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved') }
+ set member_state_clause { and member_state in ('needs approval', 'waitinglist approved', 'request approval', 'request approved', 'approved') }
}
set general_comments_url [apm_package_url_from_key "general-comments"]
@@ -296,39 +300,16 @@
set reject_url [export_vars -base application-reject { community_id {user_id $applicant_user_id} {type $list_type} return_url }]
- if { $member_state == "needs approval" ||
- $member_state == "application sent" ||
- $member_state == "waitinglist approved" ||
- $member_state == "application approved"
- } {
- if { ! [empty_string_p $session_id] } {
- if {$use_embedded_application_view_p ==1} {
- set asm_url "admin/application-view?session_id=$session_id"
- set target ""
- } else {
-
- set asm_url [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]asm-admin/results-session" { session_id }]
- set target "_blank"
- }
- }
+ if { ! [empty_string_p $session_id] } {
+ if {$use_embedded_application_view_p ==1} {
+ set asm_url "admin/application-view?session_id=$session_id"
+ set target ""
+ } else {
- } elseif { $member_state == "request approval" ||
- $member_state == "request approved" } {
-
- # Get associated assessment
- set assessment_id [parameter::get -parameter ApplicationAssessment -default ""]
-
- if { ! [empty_string_p $session_id] } {
- if {$use_embedded_application_view_p ==1} {
- set asm_url "admin/application-view?session_id=$session_id"
- set target ""
- } else {
-
- set asm_url [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]asm-admin/results-session" { session_id }]
- set target "_blank"
- }
+ set asm_url [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]asm-admin/results-session" { session_id }]
+ set target "_blank"
}
- }
+ }
set section_edit_url [export_vars -base admin/one-section { section_id return_url }]
set person_url [export_vars -base /acs-admin/users/one { {user_id $applicant_user_id} }]