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.17 -r1.18
--- openacs-4/packages/contacts/www/contact-add.tcl	17 Jun 2005 09:15:30 -0000	1.17
+++ openacs-4/packages/contacts/www/contact-add.tcl	20 Jun 2005 16:48:36 -0000	1.18
@@ -8,6 +8,8 @@
 } {
     {object_type "person"}
     {group_ids ""}
+    {rel_type ""}
+    {object_id_two ""}
 } -validate {
     valid_type -requires {object_type} {
 	if { [lsearch [list organization person] $object_type] < 0 } {
@@ -35,6 +37,9 @@
 
 set form_elements {party_id:key}
 lappend form_elements {object_type:text(hidden)}
+lappend form_elements {rel_type:text(hidden)}
+lappend form_elements {object_id_two:text(hidden)}
+
 set default_group_id [contacts::default_group -package_id $package_id]
 set application_group_id [application_group::group_id_from_package_id -package_id [ad_conn subsite_id]]
 
@@ -51,6 +56,7 @@
 
 set group_list [contact::groups -expand "all" -privilege_required "read"]
 
+
 ad_form -name party_ae \
     -mode "edit" \
     -cancel_label "[_ contacts.Cancel]" \
@@ -79,6 +85,12 @@
     }
 }
 
+# Append relationship attributes
+
+if {[exists_and_not_null rel_type]} {
+    ad_form -extend -name party_ae -form [ams::ad_form::elements -package_key "contacts" -object_type $rel_type -list_name [ad_conn package_id]]
+}
+
 # Append the option to create a user who get's a welcome message send
 # Furthermore set the title.
 
@@ -98,7 +110,6 @@
 
 set context [list $title]
 
-
 callback contact::contact_form -package_id $package_id -form party_ae -object_type $object_type
 
 ad_form -extend -name party_ae \
@@ -263,8 +274,33 @@
 		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 {}
+	    set context_id {}
+	    set creation_user [ad_conn user_id]
+	    set creation_ip [ad_conn peeraddr]
+	    set rel_id [db_exec_plsql create_rel "select acs_rel__new (
+                     :rel_id,
+                     :rel_type,
+                     :party_id,
+                     :object_id_two,
+                     :context_id,
+                     :creation_user,
+                     :creation_ip  
+                    )"]
 	    
-	    # Add the user to the
+	    if {[exists_and_not_null rel_type]} {
+		ams::ad_form::save -package_key "contacts" \
+		    -object_type $rel_type \
+		    -list_name [ad_conn package_id] \
+		    -form_name "party_ae" \
+		    -object_id $rel_id
+	    }
+	}
+
+	# Add the user to the
 	util_user_message -html -message "The $object_type <a href=\"contact?party_id=$party_id\">[contact::name -party_id $party_id]</a> was added"
 
     } -after_submit {