Index: openacs-4/packages/contacts/www/ask.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/ask.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/www/ask.adp	8 Sep 2006 12:07:50 -0000	1.1
@@ -0,0 +1,8 @@
+<master>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+<blockquote>
+<p />
+  <formtemplate id="upload_confirm"></formtemplate>
+</blockquote>
Index: openacs-4/packages/contacts/www/ask.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/ask.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/www/ask.tcl	8 Sep 2006 12:07:50 -0000	1.1
@@ -0,0 +1,37 @@
+ad_page_contract {
+    Confirm upload in delivery folder.
+
+    @author Timo Hentschel (timo@timohentschel.de)
+    @creation-date 2006-05-15
+} {
+    {group_ids ""}
+    object_id_two
+    role_two
+} -properties {
+    context:onevalue
+    page_title:onevalue
+}
+
+set user_id [auth::require_login]
+set page_title "[_ contacts.person_or_organization]"
+set context [list $page_title]
+
+set confirm_options [list [list "[_ contacts.Person]" t] [list "[_ contacts.Organization]" f]]
+
+ad_form -name upload_confirm -action ask -export {cancel_url return_url} -form {
+    {group_ids:text(hidden),optional {value $group_ids}}
+    {object_id_two:integer(hidden) {value $object_id_two}}
+    {role_two:text(hidden) {value $role_two}}
+    {confirmation:text(radio) {label "[_ contacts.person_or_organization]"} {options $confirm_options} {value f}}
+} -edit_request {
+} -after_submit {
+    set package_url [ad_conn package_url]
+    if {$confirmation} {
+	ad_returnredirect [export_vars -base "${package_url}/add/person" -url {group_ids object_id_two role_two}]
+    } else {
+	ad_returnredirect [export_vars -base "${package_url}/add/organization" -url {group_ids object_id_two role_two}]
+    }
+    ad_script_abort
+}
+
+ad_return_template
Index: openacs-4/packages/contacts/www/contact-rels.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-rels.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/contacts/www/contact-rels.tcl	12 Jun 2006 07:54:21 -0000	1.27
+++ openacs-4/packages/contacts/www/contact-rels.tcl	8 Sep 2006 12:07:50 -0000	1.28
@@ -199,6 +199,9 @@
 	    break
 	}
 	if {[exists_and_not_null add]} {
+	    if {$person_valid_p  && $org_valid_p} {
+		ad_returnredirect [export_vars -base "${package_url}/ask" -url {group_ids {object_id_two "$party_id"} role_two}]
+	    }
 	    if {$person_valid_p} {
 		ad_returnredirect [export_vars -base "${package_url}/add/person" -url {group_ids {object_id_two "$party_id"} role_two}]
 	    }