diff options
author | Matthew Somerville <matthew@mysociety.org> | 2020-04-24 18:46:49 +0100 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2020-04-24 18:46:49 +0100 |
commit | 260fc363d45fb49b09f8ea27625c9c275bc2848e (patch) | |
tree | 4af0932e715fb1e8825bf2964b78dd49fc88ab16 | |
parent | f70ef9f6a612d3387db24519e163e6b326a9fb64 (diff) |
Do not calculate user count on status page.
-rw-r--r-- | perllib/FixMyStreet/DB/ResultSet/Problem.pm | 9 | ||||
-rw-r--r-- | templates/web/base/status/stats.html | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm index 5b2079831..3e48170d8 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm @@ -241,12 +241,9 @@ sub unique_users { return $rs->search( { state => [ FixMyStreet::DB::Result::Problem->visible_states() ], }, { - select => [ { distinct => 'user_id' } ], - as => [ 'user_id' ] - } )->as_subselect_rs->search( undef, { - select => [ { count => 'user_id' } ], - as => [ 'count' ] - } )->first->get_column('count'); + columns => [ 'user_id' ], + distinct => 1, + } ); } sub categories_summary { diff --git a/templates/web/base/status/stats.html b/templates/web/base/status/stats.html index 02f9de904..90904abaa 100644 --- a/templates/web/base/status/stats.html +++ b/templates/web/base/status/stats.html @@ -2,7 +2,6 @@ [%- total_problems_live = total_problems_live | format_number; - total_problems_users = total_problems_users | format_number; comments_confirmed = (comments.confirmed || 0) | format_number; alerts_1 = alerts.1 | format_number; alerts_0 = alerts.0 | format_number; @@ -17,6 +16,7 @@ <ul> <li>[% tprintf( loc('<strong>%s</strong> live problems'), decode(total_problems_live) ) %] [% IF admin_include_users %] + [% total_problems_users = total_problems_users | format_number ~%] [% tprintf( loc('from %s different users'), decode(total_problems_users) ) %] [% END %] </li> |