diff options
author | Dave Whiteland <dave@mysociety.org> | 2012-05-02 19:39:02 +0100 |
---|---|---|
committer | Dave Whiteland <dave@mysociety.org> | 2012-05-02 19:39:02 +0100 |
commit | a7e64618f5a14a4fa73db0450b5ec2b6c33ec5a5 (patch) | |
tree | 7de5c81502d4e7b8990be11582dd179e2ce57d12 /perllib/FixMyStreet/App/Controller/Admin.pm | |
parent | 4f7cd67dc8a986dc63de4a34aedc7f135ad115db (diff) | |
parent | cb71fc55419e369da93105b1d5af9879453eb241 (diff) |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Admin.pm')
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 55372afb5..198acade6 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -485,7 +485,7 @@ sub search_reports : Path('search_reports') { ]; } elsif ($search =~ /^area:(\d+)$/) { $query = [ - 'me.areas' => { like => ",$1," } + 'me.areas' => { like => "%,$1,%" } ]; } else { $query = [ @@ -540,19 +540,20 @@ sub search_reports : Path('search_reports') { %{ $site_restriction }, ]; } - my $updates; - $updates = $c->model('DB::Comment')->search( - { - -or => $query, - }, - { - -select => [ 'me.*', qw/problem.council problem.state/ ], - prefetch => [qw/user problem/], - order_by => [\"(me.state='hidden')",\"(problem.state='hidden')",'me.created'] - } - ) if @$query; - $c->stash->{updates} = [ $updates->all ]; + if (@$query) { + my $updates = $c->model('DB::Comment')->search( + { + -or => $query, + }, + { + -select => [ 'me.*', qw/problem.council problem.state/ ], + prefetch => [qw/user problem/], + order_by => [\"(me.state='hidden')",\"(problem.state='hidden')",'me.created'] + } + ); + $c->stash->{updates} = [ $updates->all ]; + } # Switch quoting back off. See above for explanation of this. $c->model('DB')->schema->storage->sql_maker->quote_char( '' ); |