Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v diff -u -r1.11.10.2 -r1.11.10.3 --- openacs-4/packages/acs-admin/www/users/complex-search.tcl 9 Sep 2013 16:44:17 -0000 1.11.10.2 +++ openacs-4/packages/acs-admin/www/users/complex-search.tcl 1 Oct 2013 08:09:25 -0000 1.11.10.3 @@ -232,7 +232,7 @@ set user_search:[set rowcount](member_state) $member_state if { $member_state ne "approved" } { - set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "complex-search?[export_vars -url {email last_name keyword target passthrough limit_users_in_group_id only_authorized_p}]"] " | "] + set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "complex-search?[export_vars -url {email last_name keyword target passthrough limit_to_users_in_group_id only_authorized_p}]"] " | "] } else { set user_search:[set rowcount](user_finite_state_links) "" } 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.6.10.4 -r1.6.10.5 --- openacs-4/packages/acs-admin/www/users/search.tcl 1 Oct 2013 08:02:54 -0000 1.6.10.4 +++ openacs-4/packages/acs-admin/www/users/search.tcl 1 Oct 2013 08:09:25 -0000 1.6.10.5 @@ -23,7 +23,7 @@ keyword:optional target {passthrough ""} - {limit_users_in_group_id ""} + {limit_to_users_in_group_id ""} {only_authorized_p:integer 1} {limit_to_user_id ""} {from_user_id ""} @@ -109,7 +109,7 @@ lappend where_clause "cc_users.user_id not in ($limit_to_user_id)" } -if { ([info exists limit_to_users_in_group_id] && $limit_to_users_in_group_id ne "") } { +if { $limit_to_users_in_group_id ne "" } { 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 where cu.user_id = gm.member_id @@ -152,7 +152,7 @@ set user_search:[set rowcount](member_state) $member_state if { $member_state ne "approved" } { - set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "search?[export_vars -url {email last_name keyword target passthrough limit_users_in_group_id only_authorized_p}]"] " | "] + set user_search:[set rowcount](user_finite_state_links) [join [ad_registration_finite_state_machine_admin_links $member_state $email_verified_p $user_id_from_search "search?[export_vars -url {email last_name keyword target passthrough limit_to_users_in_group_id only_authorized_p}]"] " | "] } else { set user_search:[set rowcount](user_finite_state_links) "" } @@ -161,8 +161,10 @@ set user_search:rowcount $rowcount # We are limiting the search to one group - display that group's name -if { ([info exists limit_to_users_in_group_id] && $limit_to_users_in_group_id ne "") && ![regexp {[^0-9]} $limit_to_users_in_group_id] } { - set group_name [db_string user_group_name_from_id "select group_name from user_groups where group_id = :limit_to_users_in_group_id"] +if { $limit_to_users_in_group_id ne "" + && ![regexp {[^0-9]} $limit_to_users_in_group_id] } { + set group_name [db_string user_group_name_from_id \ + "select group_name from user_groups where group_id = :limit_to_users_in_group_id"] set title "User search in $group_name" } else { set group_name ""