Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 10 Jan 2007 21:22:07 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl 27 Oct 2014 16:39:51 -0000 1.7 @@ -13,7 +13,7 @@ { group_type_exact_p t } { group_name "" } { group_id:naturalnum "" } - {add_to_group_id ""} + {add_to_group_id:naturalnum ""} {add_with_rel_type "composition_rel"} { return_url "" } {group_rel_type_list ""} @@ -95,12 +95,12 @@ ## constraint violations in the database because the constraints are enforced ## by triggers in the DB. -if { $group_type_exact_p eq "f" && \ - [subsite::util::sub_type_exists_p $group_type] } { +if { $group_type_exact_p == "f" + && [subsite::util::sub_type_exists_p $group_type] } { # Sub rel-types exist... select one set group_type_exact_p "t" - set export_url_vars [ad_export_vars -exclude group_type $export_var_list ] + set export_url_vars [export_vars -exclude group_type $export_var_list ] party::types_valid_for_rel_type_multirow -datasource_name object_types -start_with $group_type -rel_type $add_with_rel_type @@ -147,8 +147,7 @@ set package_url [ad_conn package_url] foreach group_rel_type $group_rel_type_list { - set next_group_id [lindex $group_rel_type 0] - set next_rel_type [lindex $group_rel_type 1] + lassign $group_rel_type next_group_id next_rel_type lappend return_url_list \ "${package_url}admin/relations/add?group_id=$next_group_id&rel_type=[ad_urlencode $next_rel_type]&party_id=$group_id&allow_out_of_scope_p=t" }