Index: openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl 4 Oct 2005 02:54:27 -0000 1.14
+++ openacs-4/packages/contacts/tcl/contacts-callback-procs.tcl 5 Oct 2005 16:18:49 -0000 1.15
@@ -27,7 +27,7 @@
} {
}
-ad_proc -public -callback contact::person_new {
+ad_proc -public -callback contact::person_add {
{-package_id:required}
{-person_id:required}
} {
Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl 20 Sep 2005 07:09:10 -0000 1.31
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl 5 Oct 2005 16:18:49 -0000 1.32
@@ -566,7 +566,7 @@
} {
if {[empty_string_p $contacts_package_id]} {
- set contacts_package_id [ad_conn contacts_package_id]
+ set contacts_package_id [ad_conn package_id]
}
if {[empty_string_p $group_id]} {
Index: openacs-4/packages/contacts/www/contact-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-add.tcl,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/contacts/www/contact-add.tcl 4 Oct 2005 02:54:28 -0000 1.32
+++ openacs-4/packages/contacts/www/contact-add.tcl 5 Oct 2005 16:18:49 -0000 1.33
@@ -195,38 +195,37 @@
} -new_data {
if { $object_type == "person" } {
-
+
if { ![exists_and_not_null url] } {
set url ""
}
- # Initialize Person
- template::form create add_party
- template::element create add_party email -value "$email"
- template::element create add_party first_names -value "$first_names"
- template::element create add_party last_name -value "$last_name"
- template::element create add_party url -value "$url"
- set party_id [party::new -party_id $party_id -form_id add_party person]
- # party::new does not correctly save email address
- party::update -party_id $party_id -email $email -url $url
- callback contact::person_new -package_id $package_id -person_id $party_id
+ # Initialize Person
+ template::form create add_party
+ template::element create add_party email -value "$email"
+ template::element create add_party first_names -value "$first_names"
+ template::element create add_party last_name -value "$last_name"
+ template::element create add_party url -value "$url"
+ set party_id [party::new -party_id $party_id -form_id add_party person]
+ # party::new does not correctly save email address
+ party::update -party_id $party_id -email $email -url $url
- # in order to create a user we need a valid unique username (i.e. their email address).
- # the on_submit block has already validated that this is in fact a valid and unique
- # email address which will serve as their username
- if { $create_user_p == "t" } {
- contact::person_upgrade_to_user -person_id $party_id
- }
-
+ # in order to create a user we need a valid unique username (i.e. their email address).
+ # the on_submit block has already validated that this is in fact a valid and unique
+ # email address which will serve as their username
+ if { $create_user_p == "t" } {
+ contact::person_upgrade_to_user -person_id $party_id
+ }
+ callback contact::person_add -package_id $package_id -person_id $party_id
# Add the new categories and enter the Party into the groups
set cat_ids [list]
- foreach group_id $group_ids {
- group::add_member \
- -group_id $group_id \
- -user_id $party_id \
- -rel_type "membership_rel"
+ foreach group_id $group_ids {
+ group::add_member \
+ -group_id $group_id \
+ -user_id $party_id \
+ -rel_type "membership_rel"
callback contact::person_new_group -person_id $party_id -group_id $group_id
set element_name "category_ids$group_id"
@@ -235,9 +234,9 @@
}
set cat_ids [concat $cat_ids \
- [category::ad_form::get_categories \
- -container_object_id $group_id \
- -element_name $element_name]]
+ [category::ad_form::get_categories \
+ -container_object_id $group_id \
+ -element_name $element_name]]
}
category::map_object -remove_old -object_id $party_id $cat_ids
@@ -259,20 +258,20 @@
callback contact::organization_new_group -organization_id $party_id -group_id $group_id
}
}
-
+
callback contact::organization_new -package_id $package_id -contact_id $party_id -name $name
}
# Save the contact information
# No clue why this is not part of the db_transaction though ....
contact::special_attributes::ad_form_save -party_id $party_id -form "party_ae"
- set revision_id [contact::revision::new -party_id $party_id]
- foreach group_id $group_ids {
- ams::ad_form::save -package_key "contacts" \
- -object_type $object_type \
- -list_name "${package_id}__${group_id}" \
- -form_name "party_ae" \
- -object_id $revision_id
+ set revision_id [contact::revision::new -party_id $party_id]
+ foreach group_id $group_ids {
+ ams::ad_form::save -package_key "contacts" \
+ -object_type $object_type \
+ -list_name "${package_id}__${group_id}" \
+ -form_name "party_ae" \
+ -object_id $revision_id
# execute group specific callbacks
group::get -group_id $group_id -array group_array
set group_name ${group_array(group_name)}
@@ -283,7 +282,7 @@
callback contact::${object_type}_${group_array(group_name)}_new -package_id $package_id -contact_id $party_id
}
}
-
+
# Insert the relationship
if {[exists_and_not_null rel_type] && [exists_and_not_null object_id_two]} {
set rel_id {}
@@ -299,7 +298,7 @@
:creation_user,
:creation_ip
)"]
-
+
if {[exists_and_not_null rel_type]} {
ams::ad_form::save -package_key "contacts" \
-object_type $rel_type \
@@ -312,10 +311,11 @@
}
# Add the user to the
- set contact_link [contact::link -party_id $party_id]
- set object_type [_ contacts.$object_type]
+ set contact_link [contact::link -party_id $party_id]
+ set object_type [_ contacts.$object_type]
util_user_message -html -message "[_ contacts.lt_The_-object_type-_-contact_link-_was_added]"
+
} -after_submit {
contact::flush -party_id $party_id
contact::search::flush_results_counts
Index: openacs-4/packages/contacts/www/contact-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-edit.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/contacts/www/contact-edit.tcl 4 Oct 2005 02:54:28 -0000 1.11
+++ openacs-4/packages/contacts/www/contact-edit.tcl 5 Oct 2005 16:18:49 -0000 1.12
@@ -147,7 +147,7 @@
if {$object_type == "organization"} {
callback contact::organization_new -package_id $package_id -contact_id $party_id -name $name
} else {
- callback contact::person_new -package_id $package_id -person_id $party_id
+ callback contact::person_add -package_id $package_id -person_id $party_id
}
} -after_submit {
contact::flush -party_id $party_id