aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet/App/Controller/Admin.pm
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-06-27 19:58:41 +0100
committerMatthew Somerville <matthew@mysociety.org>2012-06-27 19:58:41 +0100
commite02772c71767b8f8a3d51708ce4002b1e6c3e1b6 (patch)
treed0acdcaa4da4c096fc9ca6e65d73f9f7e9944f07 /perllib/FixMyStreet/App/Controller/Admin.pm
parent45b3040884d7089e7d8c6f4acccd657b91c92a04 (diff)
Move site restriction to within query, so it is ANDed.
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm')
-rw-r--r--perllib/FixMyStreet/App/Controller/Admin.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 998cb83a8..871da737f 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -532,13 +532,11 @@ sub search_reports : Path('search_reports') {
if (is_valid_email($search)) {
$query = [
'user.email' => { ilike => $like_search },
- %{ $site_restriction },
];
} elsif ($search =~ /^id:(\d+)$/) {
$query = [
'me.id' => int($1),
'problem.id' => int($1),
- %{ $site_restriction },
];
} elsif ($search =~ /^area:(\d+)$/) {
$query = [];
@@ -550,13 +548,13 @@ sub search_reports : Path('search_reports') {
'me.name' => { ilike => $like_search },
text => { ilike => $like_search },
'me.cobrand_data' => { ilike => $like_search },
- %{ $site_restriction },
];
}
if (@$query) {
my $updates = $c->model('DB::Comment')->search(
{
+ %{ $site_restriction },
-or => $query,
},
{