Index: openacs-4/packages/acs-subsite/www/admin/relations/add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.adp,v
diff -u -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/acs-subsite/www/admin/relations/add.adp	18 Jan 2017 08:05:59 -0000	1.6.2.2
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.adp	23 Apr 2017 20:35:22 -0000	1.6.2.3
@@ -1,6 +1,6 @@
 <master>
 <property name="context">@context;literal@</property>
-<property name="doc(title)">Add @role_pretty_name;noquote@ to @group_name;noquote@</property>
+<property name="doc(title)">Add @role_pretty_name;noquote@ to @group_info.group_name;noquote@</property>
 
 <blockquote>
 
@@ -9,7 +9,7 @@
     You can select an existing @object_type_two_name@ from this subsite below.
     <br>
     If the @object_type_two_name@ that you want to add as @role_pretty_name@
-    to @group_name@ is not listed below, then you can either
+    to @group_info.group_name@ is not listed below, then you can either
     <ul>
     <li><a href="@add_out_of_scope_url@">select an existing @object_type_two_name@ from the system</a>, or
     <li><a href="@add_party_url@">add a new @object_type_two_name@ to the system</a>.
@@ -25,7 +25,7 @@
   </else>
 </if>
 <else>
-Add @party_name@ as @role_pretty_name@ of @group_name@ . . .
+Add @party_name@ as @role_pretty_name@ of @group_info.group_name@ . . .
 </else>
 <p>
 
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 -r1.15.2.4 -r1.15.2.5
--- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	20 May 2016 20:02:44 -0000	1.15.2.4
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	23 Apr 2017 20:35:22 -0000	1.15.2.5
@@ -44,39 +44,20 @@
 
 set context [list "Add relation"]
 
-set export_var_list [list group_id rel_type exact_p return_url allow_out_of_scope_p]
-
+set export_var_list {group_id rel_type exact_p return_url allow_out_of_scope_p}
 if {$party_id ne ""} {
     lappend export_var_list party_id
 }
 
-set create_p [group::permission_p -privilege create $group_id]
+group::get -group_id $group_id -array group_info
 
-
-db_1row group_info {
-    select group_name, join_policy
-    from groups
-    where group_id = :group_id
-}
-
 # We assume the group is on side 1... 
 db_1row rel_type_info {}
 
 # The role pretty names can be message catalog keys that need
 # to be localized before they are displayed
 set role_pretty_name [lang::util::localize $role_pretty_name]
 
-if {$ancestor_rel_type eq "membership_rel"} {
-    if {$join_policy eq "closed" && !$create_p} {
-	ad_complain "You do not have permission to add elements to $group_name"
-	return
-    }
-
-    set member_state [group::default_member_state -join_policy $join_policy -create_p $create_p]
-} else {
-    set member_state ""
-}
-
 if { $exact_p == "f" 
      && [subsite::util::sub_type_exists_p $rel_type] } {
 
@@ -141,12 +122,12 @@
 
 if { [template::form is_valid add_relation] } {
 
-    db_transaction {
-	set rel_id [relation_add -form_id add_relation -member_state $member_state $rel_type $group_id $party_id]
-    } on_error {
-	ad_return_error "Error creating the relation" "We got the following error message while trying to create this relation: <pre>$errmsg</pre>"
-	ad_script_abort
+    if {[catch {
+        group::add_member -group_id $group_id -user_id $party_id -rel_type $rel_type
+    } errorMsg]} {
+        ad_complain $errorMsg
     }
+
     if { $return_url eq "" } { 
 	set return_url [export_vars -base one rel_id]
     }