Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into js-validation

Conflicts:
	templates/web/default/report/display.html

1 files changed, 12 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm
index f7fb5dec5..93af3393c 100644
--- a/perllib/FixMyStreet/App/Controller/Reports.pm
+++ b/perllib/FixMyStreet/App/Controller/Reports.pm
@@ -319,8 +319,20 @@ sub load_and_group_problems : Private {
     };
     if ($c->stash->{ward}) {
         $where->{areas} = { 'like', '%,' . $c->stash->{ward}->{id} . ',%' };
+        $where->{council} = [
+            undef,
+            $c->stash->{council}->{id},
+            { 'like', $c->stash->{council}->{id} . ',%' },
+            { 'like', '%,' . $c->stash->{council}->{id} },
+        ];
     } elsif ($c->stash->{council}) {
         $where->{areas} = { 'like', '%,' . $c->stash->{council}->{id} . ',%' };
+        $where->{council} = [
+            undef,
+            $c->stash->{council}->{id},
+            { 'like', $c->stash->{council}->{id} . ',%' },
+            { 'like', '%,' . $c->stash->{council}->{id} },
+        ];
     }
     my $problems = $c->cobrand->problems->search(
         $where,