diff options
-rw-r--r-- | perllib/FixMyStreet/App/Controller/Reports.pm | 1 | ||||
-rw-r--r-- | perllib/FixMyStreet/Cobrand/UK.pm | 9 | ||||
-rwxr-xr-x | templates/web/fiksgatami/reports/index.html | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index d5ccb7f3d..f275410dc 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -57,6 +57,7 @@ sub index : Path : Args(0) { $c->stash->{areas_info} = $areas_info; my @keys = sort { strcoll($areas_info->{$a}{name}, $areas_info->{$b}{name}) } keys %$areas_info; + @keys = $c->cobrand->filter_all_council_ids_list( @keys ); $c->stash->{areas_info_sorted} = [ map { $areas_info->{$_} } @keys ]; eval { diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm index 763c3b160..3abd7a77a 100644 --- a/perllib/FixMyStreet/Cobrand/UK.pm +++ b/perllib/FixMyStreet/Cobrand/UK.pm @@ -120,6 +120,15 @@ sub remove_redundant_councils { if $all_councils->{2391}; } +sub filter_all_council_ids_list { + my $self = shift; + my @all_councils_ids = @_; + + # Ignore the four council areas introduced because of generation 15 + # (where we put the new boundaries under the old IDs) + return grep { $_ < 141648 || $_ > 141651 } @all_councils_ids; +} + sub short_name { my $self = shift; my ($area, $info) = @_; diff --git a/templates/web/fiksgatami/reports/index.html b/templates/web/fiksgatami/reports/index.html index 3cbb2bf8d..1ba90ece3 100755 --- a/templates/web/fiksgatami/reports/index.html +++ b/templates/web/fiksgatami/reports/index.html @@ -15,7 +15,6 @@ </tr> [% FOREACH area IN areas_info_sorted %] -[% NEXT IF area.id == 301 %] <tr align="center" [%- IF loop.count % 2 %] class="a" [%- END -%] |