Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/tcl/merge-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-admin/www/resources/left.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/resources/left.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/acs-admin/www/resources/not_available.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/resources/not_available.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/acs-admin/www/resources/right.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/resources/right.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/resources/um-more-info.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge-confirm.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge-confirm.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge-confirm.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge-final.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge-final.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/merge.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-admin/www/users/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/acs-admin/www/users/one.adp 13 Jan 2005 13:54:41 -0000 1.17 +++ openacs-4/packages/acs-admin/www/users/one.adp 24 May 2005 02:54:59 -0000 1.17.2.1 @@ -77,6 +77,17 @@
  • Grant site-wide administration privileges
    • +
  • Merge this user with: +
    + + + + + + +
    +
    • +
  • Reset this user's password
    •  Index: openacs-4/packages/acs-admin/www/users/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.tcl,v diff -u -r1.4 -r1.4.12.1 --- openacs-4/packages/acs-admin/www/users/search.tcl 6 Sep 2002 21:49:53 -0000 1.4 +++ openacs-4/packages/acs-admin/www/users/search.tcl 24 May 2005 02:54:59 -0000 1.4.12.1 @@ -13,6 +13,8 @@ @param target URL to return to @param passthrough Form variables to pass along from caller @param limit_to_users_in_group_id Limits search to users in the specified group id. This can be a comma separated list to allow searches within multiple groups. (optional) + @param limit_to_user_id. This is useful is you don't want to show a list of user_ids. This could be a comma separated list. (optional) + @param from_user_id is used if you want to merge the user_id with user_id_from_search (optional) @author Jin Choi (jsc@arsdigita.com) } { @@ -23,6 +25,8 @@ {passthrough ""} {limit_users_in_group_id ""} {only_authorized_p:integer 1} + {limit_to_user_id ""} + {from_user_id ""} } -properties { group_name:onevalue search_type:onevalue @@ -102,6 +106,11 @@ set passthrough_parameters "[export_entire_form_as_url_vars $passthrough]" } +if { [exists_and_not_null limit_to_user_id ] } { + set limit_to_user_id [join $limit_to_user_id ","] + lappend where_clause "cc_users.user_id not in ($limit_to_user_id)" +} + if { [exists_and_not_null limit_to_users_in_group_id] } { set query "select distinct first_names, last_name, email, member_state, email_verified_p, cu.user_id from cc_users cu, group_member_map gm, membership_rels mr @@ -132,7 +141,12 @@ set last_name_from_search $last_name set email_from_search $email - set user_search:[set rowcount](user_id) $user_id + if { [empty_string_p $from_user_id] } { + set user_search:[set rowcount](user_id) $user_id + } else { + set user_search:[set rowcount](user_id) $from_user_id + } + set user_search:[set rowcount](first_names) $first_names set user_search:[set rowcount](last_name) $last_name set user_search:[set rowcount](email) $email