[Bath,Bristol] No need for special hidden overrides.

3 files changed, 2 insertions, 14 deletions

diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm
index 06095734b..10e74056f 100644
--- a/perllib/FixMyStreet/Cobrand/BathNES.pm
+++ b/perllib/FixMyStreet/Cobrand/BathNES.pm
@@ -90,14 +90,6 @@ sub send_questionnaires { 0 }
 
 sub default_map_zoom { 3 }
 
-sub category_extra_hidden {
-    my ($self, $meta) = @_;
-    my $code = $meta->{code};
-    # These two are used in the non-Open311 'Street light fault' category.
-    return 1 if $code eq 'unitid' || $code eq 'asset_details';
-    return $self->SUPER::category_extra_hidden($meta);
-}
-
 sub available_permissions {
     my $self = shift;
 
diff --git a/perllib/FixMyStreet/Cobrand/Bristol.pm b/perllib/FixMyStreet/Cobrand/Bristol.pm
index 6e3160c89..7e85a3315 100644
--- a/perllib/FixMyStreet/Cobrand/Bristol.pm
+++ b/perllib/FixMyStreet/Cobrand/Bristol.pm
@@ -68,8 +68,10 @@ sub open311_contact_meta_override {
     $service->{group} = [];
 
     my %server_set = (easting => 1, northing => 1);
+    my %hidden_field = (usrn => 1, asset_id => 1);
     foreach (@$meta) {
         $_->{automated} = 'server_set' if $server_set{$_->{code}};
+        $_->{automated} = 'hidden_field' if $hidden_field{$_->{code}};
     }
 }
 
diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm
index 4c62dd538..322b257a7 100644
--- a/perllib/FixMyStreet/Cobrand/UK.pm
+++ b/perllib/FixMyStreet/Cobrand/UK.pm
@@ -408,12 +408,6 @@ sub lookup_by_ref_regex {
     return qr/^\s*(\d+)\s*$/;
 }
 
-sub category_extra_hidden {
-    my ($self, $meta) = @_;
-    return 1 if $meta->{code} eq 'usrn' || $meta->{code} eq 'asset_id';
-    return $self->SUPER::category_extra_hidden($meta);
-}
-
 sub report_new_munge_before_insert {
     my ($self, $report) = @_;