[Westminster] Disallow TfL categories on cobrand

Also tidies up the categories_restriction query for Northamptonshire.

2 files changed, 9 insertions, 1 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;