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.15.2.1 -r1.15.2.2
--- openacs-4/packages/acs-admin/www/users/complex-search.tcl 10 Sep 2015 08:21:09 -0000 1.15.2.1
+++ openacs-4/packages/acs-admin/www/users/complex-search.tcl 10 Sep 2015 11:23:49 -0000 1.15.2.2
@@ -74,7 +74,7 @@
and let them know what happened.\n"
}
-if { $exception_count != 00 } {
+if { $exception_count != 0 } {
ad_return_complaint $exception_count $exception_text
return
}
@@ -104,7 +104,7 @@
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 groups where group_id = :limit_to_users_in_group_id"]
+ "select group_name from groups where group_id = :limit_to_users_in_group_id"]
incr rowcount
set criteria:[set rowcount](data) \
"Is a member of '$group_name'"
@@ -195,26 +195,21 @@
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
- where (cu.user_id = gm.member_id
+ from cc_users cu, group_member_map gm
+ where (cu.user_id = gm.member_id
and gm.group_id = :limit_to_users_in_group_id)"
if {[llength $where_clause] > 0} {
append query \
"\n$where_conjunction [join $where_clause "\n$where_conjunction "]"
}
} else {
- set query "select user_id, email_verified_p, first_names, last_name, email, member_state
- from cc_users"
+ set query "select user_id, email_verified_p, first_names, last_name, email, member_state from cc_users"
if {[llength $where_clause] > 0} {
append query "\nwhere [join $where_clause "\n$where_conjunction "]"
}
}
append query "\norder by first_names, last_name"
-set i 0
-
-set user_items ""
-
set rowcount 0
db_foreach user_search_admin $query {
@@ -233,14 +228,14 @@
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 \
- [export_vars -base complex-search {
- email last_name keyword target passthrough limit_to_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 \
+ [export_vars -base complex-search {
+ 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) ""
+ set user_search:[set rowcount](user_finite_state_links) ""
}
}
Index: openacs-4/packages/acs-admin/www/users/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/index.tcl,v
diff -u -r1.5.24.2 -r1.5.24.3
--- openacs-4/packages/acs-admin/www/users/index.tcl 10 Sep 2015 11:02:09 -0000 1.5.24.2
+++ openacs-4/packages/acs-admin/www/users/index.tcl 10 Sep 2015 11:23:49 -0000 1.5.24.3
@@ -22,19 +22,15 @@
set n_users [util_commify_number $n_users]
set last_registration [lc_time_fmt $last_registration "%q"]
-set groups [db_html_select_value_options groups_select {
- select groups.group_id,
- groups.group_name,
- m.num as n_members,
- c.num as n_components
- from groups,
- (select group_id, count(*) as num
- from group_member_map group by group_id) m,
- (select group_id, count(*) as num
- from group_component_map group by group_id) c
- where groups.group_id = m.group_id
- and groups.group_id = c.group_id
- order by group_id
+set groups "\n"
+append groups [db_html_select_value_options groups_select {
+ select groups.group_id, groups.group_name
+ from groups,
+ (select distinct group_id from group_member_map) m,
+ (select distinct group_id from group_component_map) c
+ where groups.group_id = m.group_id
+ and groups.group_id = c.group_id
+ order by group_name
} ]
# Local variables:
Index: openacs-4/packages/acs-admin/www/users/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/index.xql,v
diff -u -r1.6 -r1.6.24.1
--- openacs-4/packages/acs-admin/www/users/index.xql 11 Nov 2003 14:28:54 -0000 1.6
+++ openacs-4/packages/acs-admin/www/users/index.xql 10 Sep 2015 11:23:49 -0000 1.6.24.1
@@ -30,25 +30,6 @@
-
-
-
-
-select groups.group_id,
- groups.group_name,
- m.num as n_members,
- c.num as n_components
-from groups,
- (select group_id, count(*) as num
- from group_member_map group by group_id) m,
- (select group_id, count(*) as num
- from group_component_map group by group_id) c
-where groups.group_id=m.group_id
- and groups.group_id = c.group_id
-order by group_name
-
-
-