Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl,v diff -u -N -r1.76 -r1.77 --- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 13 Mar 2006 17:52:24 -0000 1.76 +++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 12 Apr 2006 19:11:14 -0000 1.77 @@ -18,7 +18,7 @@ {all_sessions_p 0} } -set memoize_max_age [parameter::get -parameter CatalogMemoizeAge -default 10800] +set memoize_max_age [parameter::get -parameter CatalogMemoizeAge -default 120] set package_id [ad_conn package_id] set user_id [ad_conn user_id] @@ -311,7 +311,7 @@ display_template { - Section @course_list.section_name@ + @course_list.section_name@ [_ dotlrn-ecommerce.edit] @@ -503,7 +503,7 @@ set discount_clause "" } -db_multirow -extend {toggle_display_url patron_message member_state fs_chunk section_folder_id section_pages_url category_name community_url course_edit_url section_add_url section_edit_url course_grades section_grades section_zones sections_url member_p sessions instructor_names price prices shopping_cart_add_url attendees available_slots pending_p waiting_p approved_p instructor_p registration_approved_url button waiting_list_number asm_url } course_list get_courses { } { +db_multirow -extend {toggle_display_url patron_message member_state fs_chunk section_folder_id section_pages_url category_name community_url course_edit_url section_add_url section_edit_url course_grades section_grades section_zones sections_url member_p sessions instructor_names price prices shopping_cart_add_url attendees available_slots pending_p waiting_p approved_p instructor_p registration_approved_url button waiting_list_number asm_url cancel_url } course_list get_courses { } { # Since dotlrn-ecommerce is based on dotlrn-catalog, # it's possible to have a dotlrn_catalog object without an @@ -703,16 +703,21 @@ order by m.session_id desc limit 1 }] } { + set edit_asm_url [export_vars -base /assessment/assessment { assessment_id session_id }] + set cancel_url [export_vars -base application-reject { community_id user_id {send_email_p 0} {return_url [ad_return_url]} }] + if { ! [empty_string_p $completed_datetime] } { set review_asm_url [export_vars -base /assessment/session { session_id }] - set edit_asm_url [export_vars -base /assessment/assessment { assessment_id session_id }] set asm_url [subst { [_ dotlrn-ecommerce.review_application] [_ dotlrn-ecommerce.lt_Edit_your_application] + [_ dotlrn-ecommerce.lt_Cancel_your_applicati] }] } else { - set asm_url [export_vars -base /assessment/assessment { assessment_id session_id }] - set asm_url [subst {[_ dotlrn-ecommerce.lt_Your_application_is_i]}] + set asm_url [subst { + [_ dotlrn-ecommerce.lt_Your_application_is_i] + [_ dotlrn-ecommerce.lt_Cancel_your_applicati] + }] } } }