Index: openacs-4/packages/dotlrn-ecommerce/lib/dotlrn-ecommerce-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/dotlrn-ecommerce-admin-portlet.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/lib/dotlrn-ecommerce-admin-portlet.tcl 19 Jun 2005 06:05:06 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/lib/dotlrn-ecommerce-admin-portlet.tcl 6 Jul 2005 04:58:13 -0000 1.2 @@ -26,7 +26,7 @@ from dotlrn_member_rels_approved where community_id = :community_id and (rel_type = 'dotlrn_member_rel' - or rel_type = 'dotlrn_club_student_rel') + or rel_type = 'dc_student_rel') } set calendar_id [dotlrn_calendar::get_group_calendar_id -community_id $community_id] Index: openacs-4/packages/dotlrn-ecommerce/lib/section.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/section.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn-ecommerce/lib/section.tcl 4 Jul 2005 14:28:32 -0000 1.4 +++ openacs-4/packages/dotlrn-ecommerce/lib/section.tcl 6 Jul 2005 04:58:13 -0000 1.5 @@ -241,8 +241,6 @@ }] } -ns_log notice "DEBUG:: $validate" - lappend validate {price { ![template::util::negative [template::util::currency::get_property whole_part $price]] } "Price can not be negative" @@ -313,7 +311,7 @@ select user_id from dotlrn_member_rels_approved where community_id = :community_id - and rel_type = 'dotlrn_club_instructor_rel' + and rel_type = 'dc_instructor_rel' and user_id in (select user_id from dotlrn_member_rels_approved where community_id = :assistant_community_id) @@ -355,7 +353,7 @@ dotlrn_club::add_user -rel_type "dotlrn_admin_rel" -community_id $community_id -user_id $instructor -member_state "approved" } foreach assistant $assistants { - dotlrn_club::add_user -rel_type "dotlrn_club_instructor_rel" -community_id $community_id -user_id $assistant -member_state "approved" + dotlrn_club::add_user -rel_type "dc_instructor_rel" -community_id $community_id -user_id $assistant -member_state "approved" } @@ -468,7 +466,7 @@ # HAM : let's now add a "Section Administration" portlet for this new section set admin_portal_id [dotlrn_community::get_admin_portal_id -community_id $community_id] set element_id [dotlrn_ecommerce_admin_portlet::add_self_to_page -portal_id $admin_portal_id -package_id $package_id] - ns_log Notice "DEBUG : Added Admin Portal $element_id" + # ns_log Notice "DEBUG : Added Admin Portal $element_id" # we want the section admin portlet to be at the top db_dml "bring_portlet_to_top" "update portal_element_map set sort_key=0, region=1 where element_id=:element_id" @@ -568,7 +566,7 @@ select user_id from dotlrn_member_rels_approved where community_id = :community_id - and rel_type = 'dotlrn_club_instructor_rel' + and rel_type = 'dc_instructor_rel' and user_id in (select user_id from dotlrn_member_rels_approved where community_id = :assistant_community_id) @@ -596,7 +594,7 @@ foreach assistant $assistants { if { [lsearch $original_assistants $assistant] == -1 } { - catch {dotlrn_community::add_user -rel_type dotlrn_club_instructor_rel $community_id $assistant} + catch {dotlrn_community::add_user -rel_type dc_instructor_rel $community_id $assistant} } } Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql 4 Jul 2005 14:28:32 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql 6 Jul 2005 04:58:13 -0000 1.2 @@ -51,7 +51,7 @@ select count(*) as attendees from dotlrn_member_rels_approved where community_id = :community_id - and (rel_type = 'dotlrn_member_rel' or rel_type = 'dotlrn_club_student_rel') + and (rel_type = 'dotlrn_member_rel' or rel_type = 'dc_student_rel') Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql 4 Jul 2005 14:28:32 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql 6 Jul 2005 04:58:13 -0000 1.2 @@ -49,7 +49,7 @@ select count(*) as attendees from dotlrn_member_rels_approved where community_id = :community_id - and (rel_type = 'dotlrn_member_rel' or rel_type = 'dotlrn_club_student_rel') + and (rel_type = 'dotlrn_member_rel' or rel_type = 'dc_student_rel') Index: openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-memberships-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-memberships-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-memberships-create.sql 4 Jul 2005 14:28:32 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/sql/oracle/dotlrn-ecommerce-memberships-create.sql 6 Jul 2005 04:58:13 -0000 1.2 @@ -1,9 +1,9 @@ -create table dotlrn_club_student_rels ( +create table dc_student_rels ( rel_id integer constraint dcs_rels_rel_id_pk primary key constraint dcs_rels_fk references membership_rels(rel_id) ); -create or replace view dcs_rels_full +create or replace view dc_student_rels_full as select acs_rels.rel_id as rel_id, acs_rels.object_id_one as community_id, @@ -13,54 +13,56 @@ from acs_rel_types where acs_rel_types.rel_type = acs_rels.rel_type) as role, membership_rels.member_state - from dotlrn_club_student_rels, + from dc_student_rels, acs_rels, membership_rels - where dotlrn_club_student_rels.rel_id = acs_rels.rel_id + where dc_student_rels.rel_id = acs_rels.rel_id and acs_rels.rel_id = membership_rels.rel_id; -create or replace view dcs_rels_approved +create or replace view dc_student_rels_approved as select * - from dcs_rels_full + from dc_student_rels_full where member_state = 'approved'; -create or replace package dotlrn_club_student_rel +create or replace package dc_student_rel as --- dotlrn_club_student_rel__new +-- dc_student_rel__new function new ( rel_id in membership_rels.rel_id%TYPE default null, rel_type in acs_rels.rel_type%TYPE default 'membership_rel', + portal_id in portals.portal_id%TYPE, community_id in dotlrn_communities.community_id%TYPE, user_id in users.user_id%TYPE, member_state in membership_rels.member_state%TYPE, creation_user in acs_objects.creation_user%TYPE default null, creation_ip in acs_objects.creation_ip%TYPE default null - ) return dotlrn_club_student_rels.rel_id%TYPE; + ) return dc_student_rels.rel_id%TYPE; --- dotlrn_club_student_rel__delete +-- dc_student_rel__delete procedure del ( rel_id in composition_rels.rel_id%TYPE ); -end dotlrn_club_student_rel; +end dc_student_rel; / show errors -create or replace package body dotlrn_club_student_rel +create or replace package body dc_student_rel as --- dotlrn_club_student_rel__new +-- dc_student_rel__new function new ( rel_id in membership_rels.rel_id%TYPE default null, rel_type in acs_rels.rel_type%TYPE default 'membership_rel', + portal_id in portals.portal_id%TYPE, community_id in dotlrn_communities.community_id%TYPE, user_id in users.user_id%TYPE, member_state in membership_rels.member_state%TYPE, creation_user in acs_objects.creation_user%TYPE default null, creation_ip in acs_objects.creation_ip%TYPE default null - ) return dotlrn_club_student_rels.rel_id%TYPE + ) return dc_student_rels.rel_id%TYPE is v_rel_id membership_rels.rel_id%TYPE; begin @@ -75,39 +77,39 @@ ); insert - into dotlrn_club_student_rels + into dc_student_rels (rel_id) values (v_rel_id); return v_rel_id; end; --- dotlrn_club_student_rel__delete +-- dc_student_rel__delete procedure del ( rel_id in composition_rels.rel_id%TYPE ) is begin delete - from dotlrn_club_student_rels + from dc_student_rels where rel_id = rel_id; membership_rel.del(rel_id); end; -end dotlrn_club_student_rel; +end dc_student_rel; / show errors -create table dotlrn_club_instructor_rels ( +create table dc_instructor_rels ( rel_id integer constraint dci_rels_rel_id_pk primary key constraint dci_rels_fk references membership_rels(rel_id) ); -create or replace view dci_rels_full +create or replace view dc_instructor_rels_full as select acs_rels.rel_id as rel_id, acs_rels.object_id_one as community_id, @@ -117,54 +119,56 @@ from acs_rel_types where acs_rel_types.rel_type = acs_rels.rel_type) as role, membership_rels.member_state - from dotlrn_club_instructor_rels, + from dc_instructor_rels, acs_rels, membership_rels - where dotlrn_club_instructor_rels.rel_id = acs_rels.rel_id + where dc_instructor_rels.rel_id = acs_rels.rel_id and acs_rels.rel_id = membership_rels.rel_id; -create view dci_rels_approved +create or replace view dc_instructor_rels_approved as select * - from dci_rels_full + from dc_instructor_rels_full where member_state = 'approved'; -create or replace package dotlrn_club_instructor_rel +create or replace package dc_instructor_rel as --- dotlrn_club_instructor__new +-- dc_instructor__new function new ( rel_id in membership_rels.rel_id%TYPE default null, rel_type in acs_rels.rel_type%TYPE default 'membership_rel', - community_id in dotlrn_communities.community_id%TYPE, + portal_id in portals.portal_id%TYPE, + community_id in dotlrn_communities.community_id%TYPE, user_id in users.user_id%TYPE, member_state in membership_rels.member_state%TYPE, creation_user in acs_objects.creation_user%TYPE default null, creation_ip in acs_objects.creation_ip%TYPE default null - ) return dotlrn_club_instructor_rels.rel_id%TYPE; + ) return dc_instructor_rels.rel_id%TYPE; --- dotlrn_club_student_rel__delete +-- dc_instructor_rel__delete procedure delete ( rel_id in composition_rels.rel_id%TYPE ); -end dotlrn_club_instructor_rel; +end dc_instructor_rel; / show errors -create or replace package body dotlrn_club_instructor_rel +create or replace package body dc_instructor_rel as --- dotlrn_club_instructor_rel__new +-- dc_instructor_rel__new function new ( rel_id in membership_rels.rel_id%TYPE default null, rel_type in acs_rels.rel_type%TYPE default 'membership_rel', + portal_id in portals.portal_id%TYPE, community_id in dotlrn_communities.community_id%TYPE, user_id in users.user_id%TYPE, member_state in membership_rels.member_state%TYPE, creation_user in acs_objects.creation_user%TYPE default null, creation_ip in acs_objects.creation_ip%TYPE default null - ) return dotlrn_club_instructor_rels.rel_id%TYPE + ) return dc_instructor_rels.rel_id%TYPE is v_rel_id membership_rels.rel_id%TYPE; begin @@ -179,7 +183,7 @@ ); insert - into dotlrn_club_instructor_rels + into dc_instructor_rels (rel_id) values (v_rel_id); @@ -188,22 +192,22 @@ end new; --- dotlrn_club_instructor_rel__delete +-- dc_instructor_rel__delete procedure delete ( rel_id in composition_rels.rel_id%TYPE ) is v_rel_id membership_rels.rel_id%TYPE; begin delete - from dotlrn_club_instructor_rels + from dc_instructor_rels where rel_id = rel_id; membership_rel.del(rel_id); end delete; -end dotlrn_club_instructor_rel; +end dc_instructor_rel; / show errors Index: openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-memberships-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-memberships-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-memberships-create.sql 4 Jul 2005 14:28:32 -0000 1.2 +++ openacs-4/packages/dotlrn-ecommerce/sql/postgresql/dotlrn-ecommerce-memberships-create.sql 6 Jul 2005 04:58:13 -0000 1.3 @@ -3,15 +3,15 @@ -- create new rel types for club/student -create table dotlrn_club_student_rels ( +create table dc_student_rels ( rel_id integer constraint dotlrn_club_student_rels_rel_id_fk references membership_rels (rel_id) constraint dotlrn_club_student_rels_rel_id_pk primary key ); -create view dcs_rels_full +create or replace view dc_student_rels_full as select acs_rels.rel_id as rel_id, acs_rels.object_id_one as community_id, @@ -21,21 +21,21 @@ from acs_rel_types where acs_rel_types.rel_type = acs_rels.rel_type) as role, membership_rels.member_state - from dotlrn_club_student_rels, + from dc_student_rels, acs_rels, membership_rels - where dotlrn_club_student_rels.rel_id = acs_rels.rel_id + where dc_student_rels.rel_id = acs_rels.rel_id and acs_rels.rel_id = membership_rels.rel_id; -create view dcs_rels_approved +create or replace view dc_student_rels_approved as select * - from dcs_rels_full + from dc_student_rels_full where member_state = 'approved'; -select define_function_args('dotlrn_club_student_rel__new','rel_id,rel_type;dotlrn_club_student_rel,portal_id,community_id,user_id,member_state;approved,creation_user,creation_ip'); +select define_function_args('dc_student_rel__new','rel_id,rel_type;dc_student_rel,portal_id,community_id,user_id,member_state;approved,creation_user,creation_ip'); -create or replace function dotlrn_club_student_rel__new(integer,varchar,integer,integer,integer,varchar,integer,varchar) +create or replace function dc_student_rel__new(integer,varchar,integer,integer,integer,varchar,integer,varchar) returns integer as ' DECLARE p_rel_id alias for $1; @@ -60,7 +60,7 @@ ); insert - into dotlrn_club_student_rels + into dc_student_rels (rel_id) values (v_rel_id); @@ -70,14 +70,14 @@ ' language 'plpgsql'; -select define_function_args('dotlrn_club_student_rel__delete','rel_id'); +select define_function_args('dc_student_rel__delete','rel_id'); -create function dotlrn_club_student_rel__delete(integer) +create or replace function dc_student_rel__delete(integer) returns integer as ' DECLARE p_rel_id alias for $1; BEGIN - delete from dotlrn_club_student_rels where rel_id = p_rel_id; + delete from dc_student_rels where rel_id = p_rel_id; PERFORM membership_rel__delete(p_rel_id); @@ -88,15 +88,15 @@ -create table dotlrn_club_instructor_rels ( +create table dc_instructor_rels ( rel_id integer constraint dotlrn_club_instructor_rels_rel_id_fk references membership_rels (rel_id) constraint dotlrn_club_instructor_rels_rel_id_pk primary key ); -create view dci_rels_full +create or replace view dc_instructor_rels_full as select acs_rels.rel_id as rel_id, acs_rels.object_id_one as community_id, @@ -106,21 +106,21 @@ from acs_rel_types where acs_rel_types.rel_type = acs_rels.rel_type) as role, membership_rels.member_state - from dotlrn_club_instructor_rels, + from dc_instructor_rels, acs_rels, membership_rels - where dotlrn_club_instructor_rels.rel_id = acs_rels.rel_id + where dc_instructor_rels.rel_id = acs_rels.rel_id and acs_rels.rel_id = membership_rels.rel_id; -create view dci_rels_approved +create or replace view dc_instructor_rels_approved as select * - from dci_rels_full + from dc_instructor_rels_full where member_state = 'approved'; -select define_function_args('dotlrn_club_instructor_rel__new','rel_id,rel_type;dotlrn_club_instructor_rel,portal_id,community_id,user_id,member_state;approved,creation_user,creation_ip'); +select define_function_args('dc_instructor_rel__new','rel_id,rel_type;dc_instructor_rel,portal_id,community_id,user_id,member_state;approved,creation_user,creation_ip'); -create or replace function dotlrn_club_instructor_rel__new(integer,varchar,integer,integer,integer,varchar,integer,varchar) +create or replace function dc_instructor_rel__new(integer,varchar,integer,integer,integer,varchar,integer,varchar) returns integer as ' DECLARE p_rel_id alias for $1; @@ -145,7 +145,7 @@ ); insert - into dotlrn_club_instructor_rels + into dc_instructor_rels (rel_id) values (v_rel_id); @@ -155,14 +155,14 @@ ' language 'plpgsql'; -select define_function_args('dotlrn_club_instructor_rel__delete','rel_id'); +select define_function_args('dc_instructor_rel__delete','rel_id'); -create function dotlrn_club_instructor_rel__delete(integer) +create or replace function dc_instructor_rel__delete(integer) returns integer as ' DECLARE p_rel_id alias for $1; BEGIN - delete from dotlrn_club_instructor_rels where rel_id = p_rel_id; + delete from dc_instructor_rels where rel_id = p_rel_id; PERFORM membership_rel__delete(p_rel_id); Index: openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl 23 Jun 2005 12:31:49 -0000 1.7 +++ openacs-4/packages/dotlrn-ecommerce/tcl/apm-callback-procs.tcl 6 Jul 2005 04:58:13 -0000 1.8 @@ -25,14 +25,8 @@ @error } { - # add new rel types for student and instructors - # Roel: Figure out why this is failing but dotlrn_club_student_rel - # is being created - catch { - rel_types::new -supertype dotlrn_member_rel -role_two student dotlrn_club_student_rel "dotLRN Club Student" "dotLRN Club Students" dotlrn_club 0 "" user 0 "" - rel_types::new -supertype dotlrn_member_rel -role_two instructor dotlrn_club_instructor_rel "dotLRN Club Instructor" "dotLRN Club Instructors" dotlrn_club 0 "" user 0 "" - } - + rel_types::new -supertype dotlrn_member_rel -role_two student dc_student_rel "dotLRN Club Student" "dotLRN Club Students" dotlrn_club 0 "" user 0 "" + rel_types::new -role_one user -role_two user patron_rel "Patron" "Patrons" user 0 65535 user 0 65535 # Associate a dotlrn_catalog course to an assessment session result @@ -46,6 +40,13 @@ set attribute_list [package_object_attribute_list -start_with dotlrn_catalog dotlrn_catalog] set sort_order [expr [llength $attribute_list] + 1] + # add new rel types for student and instructors + # Roel: Figure out why this is failing but dc_student_rel + # is being created + catch { + rel_types::new -supertype dotlrn_member_rel -role_two instructor dc_instructor_rel "dotLRN Club Instructor" "dotLRN Club Instructors" dotlrn_club 0 "" user 0 "" + } + content::type::attribute::new \ -content_type "dotlrn_catalog" \ -attribute_name "community_id" \ Index: openacs-4/packages/dotlrn-ecommerce/tcl/implementation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/implementation-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn-ecommerce/tcl/implementation-procs.tcl 1 Jul 2005 02:30:58 -0000 1.7 +++ openacs-4/packages/dotlrn-ecommerce/tcl/implementation-procs.tcl 6 Jul 2005 04:58:13 -0000 1.8 @@ -81,7 +81,7 @@ from dotlrn_member_rels_approved where community_id = :community_id and (rel_type = 'dotlrn_member_rel' - or rel_type = 'dotlrn_club_student_rel') + or rel_type = 'dc_student_rel') } if { $attendees >= $maxparticipants } { Index: openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.xql 4 Jul 2005 14:28:32 -0000 1.2 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/course-info.xql 6 Jul 2005 04:58:13 -0000 1.3 @@ -65,7 +65,7 @@ from dotlrn_member_rels_approved where community_id = :community_id and (rel_type = 'dotlrn_member_rel' - or rel_type = 'dotlrn_club_student_rel') + or rel_type = 'dc_student_rel') Index: openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.xql 4 Jul 2005 14:28:32 -0000 1.1 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/one-section.xql 6 Jul 2005 04:58:13 -0000 1.2 @@ -12,7 +12,7 @@ select count(*) as attendees from dotlrn_member_rels_approved where community_id = :community_id - and (rel_type = 'dotlrn_member_rel' or rel_type = 'dotlrn_club_student_rel') + and (rel_type = 'dotlrn_member_rel' or rel_type = 'dc_student_rel') Index: openacs-4/packages/dotlrn-ecommerce/www/admin/process-group-purchase.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/process-group-purchase.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn-ecommerce/www/admin/process-group-purchase.tcl 4 Jun 2005 10:05:18 -0000 1.2 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/process-group-purchase.tcl 6 Jul 2005 04:58:13 -0000 1.3 @@ -52,7 +52,7 @@ from dotlrn_member_rels_approved where community_id = :community_id and (rel_type = 'dotlrn_member_rel' - or rel_type = 'dotlrn_club_student_rel') + or rel_type = 'dc_student_rel') } set available_slots [expr $maxparticipants - $attendees] @@ -138,8 +138,8 @@ -nologin] # ad_return_complaint 1 "new_user '[array get new_user]' section_community_id '${section_community_id}'" # if {[info exists new_user(user_id)]} { - # relation_add -member_state approved dotlrn_club_student_rel $section_community_id $new_user(user_id) -# package_exec_plsql -var_list [list [list community_id $section_community_id] [list rel_type "dotlrn_club_student_rel"] [list user_id $new_user(user_id)] [list member_state approved]] dotlrn_club_student_rel new + # relation_add -member_state approved dc_student_rel $section_community_id $new_user(user_id) +# package_exec_plsql -var_list [list [list community_id $section_community_id] [list rel_type "dc_student_rel"] [list user_id $new_user(user_id)] [list member_state approved]] dc_student_rel new relation_add -member_state approved membership_rel $group_id $new_user(user_id) # } Index: openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl 29 Jun 2005 18:42:46 -0000 1.8 +++ openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl 6 Jul 2005 04:58:13 -0000 1.9 @@ -403,7 +403,7 @@ from dotlrn_member_rels_approved where community_id = :community_id and (rel_type = 'dotlrn_member_rel' - or rel_type = 'dotlrn_club_student_rel') + or rel_type = 'dc_student_rel') } set available_slots [expr $maxparticipants - $attendees]