Index: openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl 25 Apr 2018 08:46:13 -0000 1.10 +++ openacs-4/packages/acs-tcl/tcl/membership-rel-procs.tcl 17 Jan 2019 17:02:00 -0000 1.11 @@ -15,7 +15,7 @@ Change the state of a membership relation } { db_transaction { - + # We need the id of the user that we are changing state for set rel_user_id [get_user_id -rel_id $rel_id] @@ -31,22 +31,22 @@ "approved" { db_exec_plsql approve {} } "banned" { db_exec_plsql ban {} } "rejected" { db_exec_plsql reject {} } - "deleted" { - db_exec_plsql delete {} - + "deleted" { + db_exec_plsql delete {} + # Add user to public group - see bug 1468 group::add_member \ -no_perm_check \ -group_id [acs_magic_object the_public] \ - -user_id $rel_user_id + -user_id $rel_user_id } "needs approval" { db_exec_plsql unapprove {} } "merged" { db_exec_plsql merge {} } } # Record who changed the state # This will trigger an update of the acs_objects.modified_date column. - # We use this in the ApprovalExpiration feature to make sure that a user isn't + # We use this in the ApprovalExpiration feature to make sure that a user isn't # bumped back to needs_approval right after an administrator has approved them, # even if the user doesn't log in the meantime. @@ -108,11 +108,11 @@ } { Return the user_id of a rel_id } { - db_1row select_rel_id { + db_1row select_rel_id { select u.user_id, r.object_id_one as group_id from acs_rels r, users u - where r.rel_id = :rel_id + where r.rel_id = :rel_id and u.user_id = r.object_id_two } return [list user_id $user_id group_id $group_id] @@ -125,7 +125,7 @@ } { return [dict get [get -rel_id $rel_id] user_id] } - + ad_proc -public get_group_id { {-rel_id:required} } {