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 -r1.10 -r1.11 --- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 8 Jul 2005 11:06:50 -0000 1.10 +++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 8 Jul 2005 15:51:44 -0000 1.11 @@ -302,7 +302,7 @@ actions { label "" display_template { - + [_ dotlrn-ecommerce.add_to_cart] @@ -320,6 +320,13 @@ [_ dotlrn-ecommerce.awaiting_approval] + +

+

+ [_ dotlrn-ecommerce.lt_Your_application_was_]

+ [_ dotlrn-ecommerce.lt_Continue_Registration] +

+
} html { width 40% nowrap } } @@ -345,7 +352,7 @@ set grade_tree_id [parameter::get -package_id [ad_conn package_id] -parameter GradeCategoryTree -default 0] -db_multirow -extend { category_name community_url course_edit_url section_add_url section_edit_url course_grades section_grades sections_url member_p sessions instructors prices shopping_cart_add_url attendees available_slots pending_p waiting_p } course_list get_courses { } { +db_multirow -extend { category_name community_url course_edit_url section_add_url section_edit_url course_grades section_grades sections_url member_p sessions instructors prices shopping_cart_add_url attendees available_slots pending_p waiting_p approved_p } course_list get_courses { } { # set mapped [category::get_mapped_categories $course_id] # foreach element $mapped { @@ -462,4 +469,15 @@ and r.object_id_two = :user_id and m.member_state = 'request approval') } -default 0] + + set approved_p [db_string approved { + select 1 + where exists (select * + from acs_rels r, + membership_rels m + where r.rel_id = m.rel_id + and r.object_id_one = :community_id + and r.object_id_two = :user_id + and m.member_state = 'request approved') + } -default 0] }