diff options
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Northamptonshire.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Westminster.pm | 8 | ||||
| -rw-r--r-- | t/app/controller/auth_social.t | 2 | ||||
| -rw-r--r-- | templates/web/westminster/report/new/top_message.html | 0 |
4 files changed, 10 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm index 533dad5d3..f16700820 100644 --- a/perllib/FixMyStreet/Cobrand/Northamptonshire.pm +++ b/perllib/FixMyStreet/Cobrand/Northamptonshire.pm @@ -27,7 +27,7 @@ sub disambiguate_location { sub categories_restriction { my ($self, $rs) = @_; - return $rs->search( [ { 'body.name' => 'Northamptonshire County Council' } ], { join => { body => 'body_areas' } }); + return $rs->search( { 'body.name' => 'Northamptonshire County Council' }, { join => 'body' }); } sub send_questionnaires { 0 } diff --git a/perllib/FixMyStreet/Cobrand/Westminster.pm b/perllib/FixMyStreet/Cobrand/Westminster.pm index 3d99e59c4..dc8765bae 100644 --- a/perllib/FixMyStreet/Cobrand/Westminster.pm +++ b/perllib/FixMyStreet/Cobrand/Westminster.pm @@ -145,4 +145,12 @@ sub _fetch_features_url { return $cfg->{proxy_url} . "?" . $uri->as_string; } +sub categories_restriction { + my ($self, $rs) = @_; + # Westminster don't want TfL categories on their cobrand + # XXX This still shows "These will be sent to TfL or Westminster City Council" + # on /report/new before a category is selected... + return $rs->search( { 'body.name' => 'Westminster City Council' }, { join => 'body' }); +} + 1; diff --git a/t/app/controller/auth_social.t b/t/app/controller/auth_social.t index 80b700e29..f499da659 100644 --- a/t/app/controller/auth_social.t +++ b/t/app/controller/auth_social.t @@ -14,7 +14,7 @@ my $mech = FixMyStreet::TestMech->new; FixMyStreet::App->log->disable('info'); END { FixMyStreet::App->log->enable('info'); } -my $body = $mech->create_body_ok(2504, 'Westminster Council'); +my $body = $mech->create_body_ok(2504, 'Westminster City Council'); my ($report) = $mech->create_problems_for_body(1, $body->id, 'My Test Report'); diff --git a/templates/web/westminster/report/new/top_message.html b/templates/web/westminster/report/new/top_message.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/westminster/report/new/top_message.html |