Index: openacs-4/packages/acs-subsite/www/admin/relations/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	10 Jan 2007 21:22:08 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	27 Oct 2014 16:39:55 -0000	1.11
@@ -9,9 +9,9 @@
     @creation-date 2000-12-11
     @cvs-id $Id$
 } {
-    group_id:integer,notnull
+    group_id:naturalnum,notnull
     rel_type:notnull
-    {party_id:integer ""}
+    {party_id:naturalnum ""}
     { exact_p "f" }
     { return_url "" }
     { allow_out_of_scope_p "f" }
@@ -25,14 +25,14 @@
     add_party_url:onevalue
 } -validate {
     party_in_scope_p -requires {party_id:notnull} {
-	if { $allow_out_of_scope_p eq "f" && \
-		![application_group::contains_party_p -party_id $party_id]} {
+	if { $allow_out_of_scope_p == "f" 
+	     && ![application_group::contains_party_p -party_id $party_id]} {
 	    ad_complain "The party either does not exist or does not belong to this subsite."
 	}
     }
     rel_type_valid_p -requires {group_id:notnull rel_type:notnull exact_p:notnull} {
-	if {$exact_p eq "t" && \
-	    ![relation_type_is_valid_to_group_p -group_id $group_id $rel_type]} {
+	if {$exact_p == "t" 
+	    && ![relation_type_is_valid_to_group_p -group_id $group_id $rel_type]} {
 	    ad_complain "Relations of this type to this group would violate a relational constraint."
 	}
     }
@@ -92,12 +92,12 @@
     set member_state ""
 }
 
-if { $exact_p eq "f" && \
-	[subsite::util::sub_type_exists_p $rel_type] } {
+if { $exact_p == "f" 
+     && [subsite::util::sub_type_exists_p $rel_type] } {
 
     # Sub rel-types exist... select one
     set exact_p "t"
-    set export_url_vars [ad_export_vars -exclude rel_type $export_var_list ]
+    set export_url_vars [export_vars -exclude rel_type $export_var_list ]
 
     relation_types_valid_to_group_multirow \
 	    -datasource_name object_types \
@@ -126,14 +126,14 @@
 set party_type_exact_p f
 set add_to_group_id $group_id
 set add_with_rel_type $rel_type
-set add_party_url "[ad_conn package_url]admin/parties/new?[ad_export_vars {add_to_group_id add_with_rel_type party_type party_type_exact_p return_url}]"
+set add_party_url "[ad_conn package_url]admin/parties/new?[export_vars {add_to_group_id add_with_rel_type party_type party_type_exact_p return_url}]"
 
 # Build a url used to select an existing party from the system (as opposed
 # to limiting the selection to parties on the current subsite).
-set add_out_of_scope_url "[ad_conn url]?[ad_export_vars -exclude allow_out_of_scope_p $export_var_list]&allow_out_of_scope_p=t"
+set add_out_of_scope_url "[ad_conn url]?[export_vars -exclude allow_out_of_scope_p $export_var_list]&allow_out_of_scope_p=t"
 
 # Build a url used to select an existing party from the current subsite
-set add_in_scope_url "[ad_conn url]?[ad_export_vars -exclude allow_out_of_scope_p $export_var_list]&allow_out_of_scope_p=f"
+set add_in_scope_url "[ad_conn url]?[export_vars -exclude allow_out_of_scope_p $export_var_list]&allow_out_of_scope_p=f"
 
 
 # We select out all parties that are to not already belong to the
@@ -159,7 +159,7 @@
 	ad_script_abort
     }
     if { $return_url eq "" } { 
-	set return_url one?[ad_export_vars rel_id]
+	set return_url one?[export_vars rel_id]
     }
     ad_returnredirect $return_url
     ad_script_abort
@@ -202,7 +202,7 @@
     # the list of parties that can be added to $group_id with a relation
     # of type $rel_type.
     
-    if {$allow_out_of_scope_p eq "f"} {
+    if {$allow_out_of_scope_p == "f"} {
 	set scope_query [db_map select_parties_scope_query]
 
 	set scope_clause "
@@ -221,7 +221,7 @@
 
     if { [llength $party_option_list] == 0 } {
 	ad_return_template add-no-valid-parties
-	ad_return
+	return
     }
     
     template::element create add_relation party_id \