Index: openacs-4/packages/contacts/www/contact.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v diff -u -r1.35 -r1.36 --- openacs-4/packages/contacts/www/contact.adp 19 Oct 2005 19:28:25 -0000 1.35 +++ openacs-4/packages/contacts/www/contact.adp 20 Oct 2005 13:58:21 -0000 1.36 @@ -113,6 +113,3 @@ - - - Index: openacs-4/packages/contacts/www/group-parties-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-parties-add.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/contacts/www/group-parties-add.tcl 6 Jul 2005 23:40:25 -0000 1.5 +++ openacs-4/packages/contacts/www/group-parties-add.tcl 20 Oct 2005 13:58:21 -0000 1.6 @@ -71,6 +71,9 @@ set rel_type "membership_rel" } organization { + # Execute the callback for the organization depending on the group they are added to. + # We use this callback to add the organization to .LRN if it is a Customer + callback contact::organization_new_group -organization_id $party_id -group_id $group_id set rel_type "organization_rel" } } @@ -92,6 +95,7 @@ db_dml insert_state { insert into membership_rels (rel_id,member_state) values (:rel_id,'approved') } } + } } } Index: openacs-4/packages/contacts/www/group-party-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/group-party-add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/contacts/www/group-party-add.tcl 30 Aug 2005 09:37:33 -0000 1.4 +++ openacs-4/packages/contacts/www/group-party-add.tcl 20 Oct 2005 13:58:21 -0000 1.5 @@ -31,7 +31,11 @@ set ip_addr [ad_conn peeraddr] set rel_id [db_exec_plsql add_organization_rel {}] db_dml insert_state {} - # relation_add -member_state "approved" $rel_type $group_id $party_id + + # Execute the callback for the organization depending on the group they are added to. + # We use this callback to add the organization to .LRN if it is a Customer + callback contact::organization_new_group -organization_id $party_id -group_id $group_id + } else { group::add_member \ -group_id $group_id \