Index: openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	29 Jan 2006 16:18:16 -0000	1.23
+++ openacs-4/packages/contacts/catalog/contacts.de_DE.ISO-8859-1.xml	20 Apr 2006 14:09:08 -0000	1.24
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="contacts" package_version="1.1d12" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="contacts" package_version="1.2b9" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="--_select_a_group_--">-- eine Gruppe markieren --</msg>
   <msg key="--Create_New_Message--">-- Neue Nachricht erstellen --</msg>
   <msg key="--none--">-- Keine --</msg>
+  <msg key="--select_a_person--">-- Person w�hlen --</msg>
+  <msg key="--select_an_organization--">-- Organisation w�hlen --</msg>
   <msg key="--select_one--">-- Bitte ausw�hlen --</msg>
   <msg key="Action">Aktion</msg>
   <msg key="Actions">Aktionen</msg>
@@ -23,6 +25,7 @@
   <msg key="Add_new_in_Group">Eine neue %object_type% Gruppen zuteilen</msg>
   <msg key="Add_Organization">Neue Organisation</msg>
   <msg key="Add_Person">Neue Person</msg>
+  <msg key="Add_Relationship">Beziehung hinzuf�gen</msg>
   <msg key="Add_Search">Suche hinzuf�gen</msg>
   <msg key="Add_Signature">Eine Signatur hinzuf�gen</msg>
   <msg key="Add_the_selected_contacts_to_a_category">Den ausgew�hlten Kontakt zu einer Kategorie hinzuweisen</msg>
@@ -91,6 +94,7 @@
   <msg key="Contact_-">Kontakt -&amp;gt;</msg>
   <msg key="contact_is_in_-">Kontakt ist in -&gt;</msg>
   <msg key="contact_is_not_in_-">Kontakt ist nicht in -&gt;</msg>
+  <msg key="contact_rel_change">Neu zuweisen</msg>
   <msg key="Contact_Relationship">Kontakt Beziehung</msg>
   <msg key="Contact_Type">Kontakttyp</msg>
   <msg key="Contact_Type_One">Kontakttyp eins</msg>
@@ -160,6 +164,7 @@
   <msg key="First_Name">Vorname</msg>
   <msg key="First_Names">Vornamen</msg>
   <msg key="Footer">Fu�zeile</msg>
+  <msg key="Freelancer_bookings">Fremdauftr�ge</msg>
   <msg key="Freelancers">Freelancer</msg>
   <msg key="From">Von</msg>
   <msg key="Get">Lade</msg>
@@ -206,6 +211,8 @@
   <msg key="lt_--_top_level_group_--">-- Gruppe erste Ebene --</msg>
   <msg key="lt_Add_new_in_Selected_Groups">Eine neue %object_type% hinzuf�gen und den ausgew�hlten Gruppen zuordnen</msg>
   <msg key="lt_Add_new_relsrelations">Hinzuf�gen neuer %rels.relationship%</msg>
+  <msg key="lt_Add_relationship_to_these_orgs">Beziehung zu diesen Organisationen hinzuf�gen</msg>
+  <msg key="lt_Add_relationship_to_these_people">Beziehung zu folgenden Personen hinzuf�gen</msg>
   <msg key="lt_Add_relationship_type">Hinzuf�gen Beziehungstyp</msg>
   <msg key="lt_Add_to_Selected_Group">Zu markierter/n Gruppe/n hinzuf�gen</msg>
   <msg key="lt_Advanced_searches_are">Erweiterte Suchen sind sehr vielf�ltig, aber sie ben�tigen spezifischen Input</msg>
@@ -257,6 +264,7 @@
   <msg key="lt_country_code_is_not_-">L�nderkennziffer ist nicht -&gt;</msg>
   <msg key="lt_created_in_the_last_-">Erstellt in den letzten -&gt;</msg>
   <msg key="lt_Currently_the_group_">Zurzeit ist die Gruppe in der Lage, die folgenden Beziehungstypen zu nutzen:</msg>
+  <msg key="lt_dear_ladies_and">Sehr geehrte Damen und Herren</msg>
   <msg key="lt_Debugging_Code_-_Only">Debugging Code - Nur SW Admins sehen dies</msg>
   <msg key="lt_Define_a_new_relation">Definition eines neuen Beziehungstyps</msg>
   <msg key="lt_Delete_the_selected_C">Selektierte Kontakte l�schen</msg>
@@ -289,7 +297,6 @@
   <msg key="lt_not_created_in_the_la">nicht erstellt in den letzten -&gt;</msg>
   <msg key="lt_not_updated_in_the_la">nicht upgedatet in den letzten -&gt;</msg>
   <msg key="lt_of_the_following_cond">der folgenden Bedingungen:&lt;br&gt;</msg>
-  <msg key="lt_Once_done_printing_-return_url-">Sobald Sie diese Briefe ausgedruckt haben k�nnen Sie  &lt;a href=&quot;%return_url%&quot;&gt;dorthin zur�ckkehren wo Sie waren&lt;/a&gt;.</msg>
   <msg key="lt_Once_ready_for_releas">Sobald der Release ansteht, wird dieses im Softwarecode ber�cksichtigt.</msg>
   <msg key="lt_Organization_Name_con">&quot;Organization Name&quot; enth�lt &quot;Search_Word&quot; oder</msg>
   <msg key="lt_Organization_Relation">Organisationsbeziehung</msg>
@@ -302,6 +309,8 @@
   <msg key="lt_remember_that_you_can">Bei der Erstellung k�nnen sie nutzen: &amp;lt;a href=&amp;quot;message-help&amp;quot;&amp;gt;mail merge substitutions&amp;lt;/a&amp;gt;. Die gebr�uchlichsten Platzhalter sind \{name\} \{first_names\}, \{last_name\}, \{home_address\} und \{date\}</msg>
   <msg key="lt_Remove_from_Selected_">Entfernen von markierter/n Gruppe(n)</msg>
   <msg key="lt_Remove_from_this_Grou">Von Gruppe entfernen</msg>
+  <msg key="lt_Remove_others_of_this_role_from_these_contacts">L�sche alle anderen Beziehungen desselben Typs zu diesen Kontakten</msg>
+  <msg key="lt_Remove_others_of_this_role_from_this_related_contact">L�sche alle anderen Beziehungen diesen Typs beim hinzugef�gten Kontakt</msg>
   <msg key="lt_role_exists">%role% existiert</msg>
   <msg key="lt_role_in_the_search_search_link">%role% ist in der Suche %search_link%</msg>
   <msg key="lt_role_not_in_the_search_search_link">%role% nicht in der Suche %search_link%</msg>
@@ -423,6 +432,7 @@
   <msg key="Permissions_for_default_group">Zugriffsrechte f�r Standardgruppe</msg>
   <msg key="Person">Person</msg>
   <msg key="Person_Form">Personen Formblatt</msg>
+  <msg key="Please_choose_a_contact">Bitte w�hlen Sie einen Kontakt</msg>
   <msg key="pp">i.V.</msg>
   <msg key="Pretty_name">Angezeigter Name</msg>
   <msg key="pretty_name_help">Der Name der bei dieser Liste als �berschrift angezeigt wird.</msg>
@@ -444,6 +454,7 @@
   <msg key="READ_THESE">LESEN SIE BITTE DIESES</msg>
   <msg key="Recipients">Empf�nger</msg>
   <msg key="Refund">R�ckerstattung</msg>
+  <msg key="Related_contact">Beziehung zu</msg>
   <msg key="Relationship">Beziehung</msg>
   <msg key="Relationship_Added">Beziehung hinzugef�gt</msg>
   <msg key="Relationship_Deleted">Beziehung gel�scht</msg>
@@ -460,7 +471,9 @@
   <msg key="Results">Ergebnisse:</msg>
   <msg key="Return_to_title">Zur�ck zu %title%</msg>
   <msg key="Role">Rolle</msg>
+  <msg key="Role_for_these_contacts">Art der Beziehung dieser Kontakte</msg>
   <msg key="Role_Name">Rollenname</msg>
+  <msg key="Role_of_related_contact">Art der Beziehung</msg>
   <msg key="Role_One">Rolle eins</msg>
   <msg key="Role_Singular">Rolle Singular</msg>
   <msg key="Role_Two">Rolle zwei</msg>
@@ -472,6 +485,7 @@
   <msg key="save_this_search_">Speichern dieser Suche</msg>
   <msg key="Saved_Searches">Gespeicherte Suchen</msg>
   <msg key="Search">Suchen</msg>
+  <msg key="Search_again">Erneut suchen...</msg>
   <msg key="search_contact">Kontakt suchen</msg>
   <msg key="Search_Existing">Existierenden suchen</msg>
   <msg key="Search_for">Suche nach</msg>
@@ -526,6 +540,7 @@
   <msg key="True">richtig</msg>
   <msg key="Turnover">Auftragswert:</msg>
   <msg key="Type">Typ</msg>
+  <msg key="Untitled">Unbenannt</msg>
   <msg key="Update">Update</msg>
   <msg key="Update_filenames">Update Dateinamen</msg>
   <msg key="Updated_By">Update durch</msg>
Index: openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml,v
diff -u -r1.73 -r1.74
--- openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	5 Apr 2006 22:21:35 -0000	1.73
+++ openacs-4/packages/contacts/catalog/contacts.en_US.ISO-8859-1.xml	20 Apr 2006 14:09:08 -0000	1.74
@@ -100,6 +100,7 @@
   <msg key="Contact_-">Contact -&gt;</msg>
   <msg key="contact_is_in_-">contact is in -&gt;</msg>
   <msg key="contact_is_not_in_-">contact is not in -&gt;</msg>
+  <msg key="contact_rel_change">Change</msg>
   <msg key="Contact_Relationship">Contact Relationship</msg>
   <msg key="Contact_Type">Contact Type</msg>
   <msg key="Contact_Type_One">Contact Type One</msg>
@@ -175,6 +176,7 @@
   <msg key="First_Name">First Name</msg>
   <msg key="First_Names">First Names</msg>
   <msg key="Footer">Footer</msg>
+  <msg key="Freelancer_bookings">Freelancer Bookings</msg>
   <msg key="Freelancers">Freelancers</msg>
   <msg key="From">From</msg>
   <msg key="Generating_PDF">Generating PDF</msg>
@@ -288,6 +290,7 @@
   <msg key="lt_country_code_is_not_-">country code is not -&gt;</msg>
   <msg key="lt_created_in_the_last_-">created in the last -&gt;</msg>
   <msg key="lt_Currently_the_group_">Currently, the group is able to handle the following types of relationships:</msg>
+  <msg key="lt_dear_ladies_and">Dear ladies and gentlemen</msg>
   <msg key="lt_Debugging_Code_-_Only">Debugging Code - Only SW Admins See This</msg>
   <msg key="lt_Define_a_new_relation">Define a new relationship type</msg>
   <msg key="lt_Delete_requires_return_url">Deleting an item from history requires a return_url</msg>
@@ -594,6 +597,7 @@
   <msg key="True">True</msg>
   <msg key="Turnover">Turnover:</msg>
   <msg key="Type">Type</msg>
+  <msg key="Untitled">Untitled</msg>
   <msg key="Update">Update</msg>
   <msg key="Update_filenames">Update filenames</msg>
   <msg key="Updated_By">Updated By</msg>
@@ -611,6 +615,7 @@
   <msg key="View_next">View next</msg>
   <msg key="Visit_Club">Visit Club</msg>
   <msg key="Watch_all_changes">Watch all changes</msg>
+  <msg key="werbemailing">Werbemailing</msg>
   <msg key="which_match">which match</msg>
   <msg key="Widget">Widget</msg>
   <msg key="with">with</msg>
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.22 -r1.23
--- openacs-4/packages/contacts/www/contact-rels.tcl	16 Feb 2006 15:42:40 -0000	1.22
+++ openacs-4/packages/contacts/www/contact-rels.tcl	20 Apr 2006 14:09:07 -0000	1.23
@@ -82,6 +82,7 @@
 set member_state "approved"
 set format "normal"
 
+set bulk_actions [list "[_ contacts.contact_rel_change]" "../relationship-bulk-move" "[_ contacts.contact_rel_change]"]
 set admin_p [ad_permission_p [ad_conn package_id] admin]
 #set default_group_id [contacts::default_group_id]
 set title "Contacts"
@@ -198,8 +199,11 @@
     -html {width 100%} \
     -name "relationships" \
     -multirow "relationships" \
+    -key rel_id \
     -row_pretty_plural "[_ contacts.relationships]" \
     -selected_format "normal" \
+    -bulk_actions $bulk_actions \
+    -bulk_action_export_vars {party_id} \
     -elements {
         role {
             label "[_ contacts.Art_of_Relationship]"
@@ -240,6 +244,7 @@
 	    label "[_ contacts.Table]"
 	    layout table
 	    row {
+		checkbox {}
                 role {}
                 other_name {}
                 details {}
Index: openacs-4/packages/contacts/www/relationship-bulk-add-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-bulk-add-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/relationship-bulk-add-postgresql.xql	24 Mar 2006 13:18:04 -0000	1.1
+++ openacs-4/packages/contacts/www/relationship-bulk-add-postgresql.xql	20 Apr 2006 14:09:07 -0000	1.2
@@ -83,12 +83,12 @@
 select rel_id
   from acs_rels 
  where rel_type = :rel_type
-   and object_id_one = :object_id_one
-   and object_id_two = :object_id_two
+   and ((:switch_roles_p = 0 and object_id_one = :object_id_one and object_id_two = :object_id_two)
+   or (:switch_roles_p = 1 and object_id_one = :object_id_two and object_id_two = :object_id_one))
       </querytext>
 </fullquery>
 
-<fullquery name="create_rel">
+<fullquery name="create_forward_rel">
       <querytext>
 select acs_rel__new (
                      :rel_id,
@@ -102,6 +102,20 @@
       </querytext>
 </fullquery>
 
+<fullquery name="create_backward_rel">
+      <querytext>
+select acs_rel__new (
+                     :rel_id,
+                     :rel_type,
+                     :object_id_two,
+                     :object_id_one,
+                     :context_id,
+                     :creation_user,
+                     :creation_ip  
+                    )
+      </querytext>
+</fullquery>
+
 <fullquery name="insert_contact_rel">
       <querytext>
 insert into contact_rels
Index: openacs-4/packages/contacts/www/relationship-bulk-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-bulk-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/relationship-bulk-add.tcl	27 Mar 2006 07:42:44 -0000	1.2
+++ openacs-4/packages/contacts/www/relationship-bulk-add.tcl	20 Apr 2006 14:09:07 -0000	1.3
@@ -10,6 +10,8 @@
     {return_url}
     {role_one ""}
     {role_two ""}
+    {remove_role_one:optional}
+    {switch_roles_p 0}
 }
 
 set title [_ contacts.Add_Relationship]
@@ -48,7 +50,7 @@
 set object_types [list "party" $contact_type]
 set rel_two_options [db_list_of_lists get_rels {}]
 set rel_two_options [ams::util::localize_and_sort_list_of_lists -list $rel_two_options]
-set rel_two_options [concat [list [list "" ""]] $rel_two_options]
+set rel_two_options [concat [list [list "" ""]] [lang::util::localize $rel_two_options]]
 
 if { $role_two ne "" && $role_one ne "" } {
     # we verify that the role still exists
@@ -59,20 +61,20 @@
     }
 }
 if { $role_two ne "" } {
-    set role_one_options [ams::util::localize_and_sort_list_of_lists -list [db_list_of_lists get_rel_types {}]]
+    set role_one_options [lang::util::localize [ams::util::localize_and_sort_list_of_lists -list [db_list_of_lists get_rel_types {}]]]
     if { [llength $role_one_options] == "0" } {
 	ad_return_error "[_ contacts.Error]" "[_ contacts.lt_There_was_a_problem_w]"
     } elseif { [llength $role_one_options] == "1" } {
 	set role_one [lindex [lindex $role_one_options 0] 1]
-	set role_one_pretty [lindex [lindex $role_one_options 0] 2]
+	set role_one_pretty [lindex [lindex $role_one_options 0] 0]
     } else {
 	set role_one_options [concat [list [list "" ""]] $role_one_options]
 	set role_one ""
     }
 }
 
 
-ad_form -name "add_edit" -method "GET" -export {party_ids return_url} -form {
+ad_form -name "add_edit" -method "GET" -export {party_ids return_url switch_roles_p} -form {
     {remove_role_one:boolean(checkbox),optional
 	{label ""}
 	{options {{"[_ contacts.lt_Remove_others_of_this_role_from_these_contacts]" 1}}}
@@ -100,7 +102,8 @@
     }
     # value has to be set this way to override on refreshes
     template::element::set_value add_edit role_one $role_one
-    template::element::set_value add_edit role_one_pretty [lang::util::localize [db_string get_role_one_pretty {}]]
+    template::element::set_value add_edit role_one_pretty $role_one_pretty
+    ## [lang::util::localize [db_string get_role_one_pretty {}]]
 } else {
     ad_form -extend -name "add_edit" -form {
 	{role_one:text(hidden),optional}
@@ -109,7 +112,6 @@
 	    {value "[_ contacts.dependent_on_role_of_related_contact]"}
 	}
     }
-
 }
 
 ad_form -extend -name "add_edit" -form {
@@ -130,40 +132,46 @@
 } -validate {
 } -on_submit {
 
-    if { ![db_0or1row get_rel_info {}] } {
-	break
-    }
-    set object_type_two [contact::type -party_id $object_id_two]
-    if { $object_type_two eq "organization" && [lsearch [list person party] $secondary_object_type] >= 0 } {
-	template::element::set_error add_edit object_id_two [_ contacts.The_selected_relationship_requires_related_person]
-    }
-    if { $object_type_two ne "organization" && [lsearch [list organization party] $secondary_object_type] >= 0 } { 
-	template::element::set_error add_edit object_id_two [_ contacts.The_selected_relationship_requires_related_org]
-    }
-    if { ![template::form::is_valid add_edit] } {
-	break
-    }
-    if { $remove_role_two eq "1" } {
-	set party_id $object_id_two
-	db_list delete_all_rels {}
-    }
-    set context_id {}
-    set creation_user [ad_conn user_id]
-    set creation_ip [ad_conn peeraddr]
-    foreach object_id_one $party_ids {
-	if { $remove_role_one eq "1" } {
-	    set party_id $object_id_one
+    db_transaction {
+	if { ![db_0or1row get_rel_info {}] } {
+	    break
+	}
+	set object_type_two [contact::type -party_id $object_id_two]
+	if { $object_type_two eq "organization" && [lsearch [list person party] $secondary_object_type] >= 0 } {
+	    template::element::set_error add_edit object_id_two [_ contacts.The_selected_relationship_requires_related_person]
+	}
+	if { $object_type_two ne "organization" && [lsearch [list organization party] $secondary_object_type] >= 0 } { 
+	    template::element::set_error add_edit object_id_two [_ contacts.The_selected_relationship_requires_related_org]
+	}
+	if { ![template::form::is_valid add_edit] } {
+	    break
+	}
+	if { $remove_role_two eq "1" } {
+	    set party_id $object_id_two
 	    db_list delete_all_rels {}
 	}
-	set existing_rel_id [db_string rel_exists_p {} -default {}]
-	if { [empty_string_p $existing_rel_id] } {
-	    set rel_id {}
-	    set rel_id [db_exec_plsql create_rel {}]
-	    db_dml insert_contact_rel {}
+	set context_id {}
+	set creation_user [ad_conn user_id]
+	set creation_ip [ad_conn peeraddr]
+	foreach object_id_one $party_ids {
+	    if { $remove_role_one eq "1" } {
+		set party_id $object_id_one
+		db_list delete_all_rels {}
+	    }
+	    set existing_rel_id [db_string rel_exists_p {} -default {}]
+	    if { [empty_string_p $existing_rel_id] } {
+		set rel_id {}
+		if {$switch_roles_p} {
+		    set rel_id [db_exec_plsql create_backward_rel {}]
+		} else {
+		    set rel_id [db_exec_plsql create_forward_rel {}]
+		}
+		db_dml insert_contact_rel {}
+	    }
+	    contact::flush -party_id $object_id_one
 	}
-	contact::flush -party_id $object_id_one
+	contact::flush -party_id $object_id_two
     }
-    contact::flush -party_id $object_id_two
 
 } -after_submit {
     ad_returnredirect $return_url
Index: openacs-4/packages/contacts/www/relationship-bulk-move-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-bulk-move-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/www/relationship-bulk-move-postgresql.xql	20 Apr 2006 14:09:07 -0000	1.1
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="get_other_party_ids">
+      <querytext>
+    select case when object_id_one = :party_id then object_id_two else object_id_one end as other_party_id
+    from acs_rels
+    where rel_id in ([join $rel_id ,])
+      </querytext>
+</fullquery>
+
+<fullquery name="all_roles">
+      <querytext>
+    select distinct case when r.object_id_one = :party_id then t.role_two else t.role_one end as role_one,
+           case when r.object_id_one = :party_id then t.role_one else t.role_two end as role_two,
+           case when r.object_id_one = :party_id then 1 else 0 end as switch_roles_p
+    from acs_rel_types t, acs_rels r
+    where r.rel_type = t.rel_type
+    and rel_id in ([join $rel_id ,])
+      </querytext>
+</fullquery>
+
+</queryset>
Index: openacs-4/packages/contacts/www/relationship-bulk-move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-bulk-move.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/www/relationship-bulk-move.tcl	20 Apr 2006 14:09:07 -0000	1.1
@@ -0,0 +1,41 @@
+ad_page_contract {
+    Move existing relationships to other contact.
+
+    @author Timo Hentschel timo@timohentschel.de
+    @creation-date 2006-04-19
+    @cvs-id $Id: relationship-bulk-move.tcl,v 1.1 2006/04/20 14:09:07 timoh Exp $
+} {
+    {party_id:integer,notnull}
+    {party_two:optional}
+    {query ""}
+    {orderby "role,asc"}
+    {rel_id:multiple}
+} -validate {
+    contact_one_exists -requires {party_id} {
+	if { ![contact::exists_p -party_id $party_id] } {
+	    ad_complain "[_ contacts.lt_The_first_contact_spe]"
+	}
+    }
+    contact_two_exists -requires {party_two} {
+	if { ![contact::exists_p -party_id $party_two] } {
+	    ad_complain "[_ contacts.lt_The_second_contact_sp]"
+	}
+    }
+
+}
+contact::require_visiblity -party_id $party_id
+
+set return_url "$party_id/relationships"
+set party_ids [db_list get_other_party_ids {}]
+set roles [db_list_of_lists all_roles {}]
+
+if {[llength $roles] > 1} {
+    error "[_ contacts.lt_neither_person_nor_or]"
+    ad_script_abort
+}
+
+set role_one [lindex [lindex $roles 0] 0]
+set role_two [lindex [lindex $roles 0] 1]
+set switch_roles_p [lindex [lindex $roles 0] 2]
+
+ad_returnredirect [export_vars -base relationship-bulk-add {party_ids return_url role_one role_two switch_roles_p {remove_role_one 1}}]