Merge tag 'v3.1' into fiksgatami-devfiksgatami-dev

1 files changed, 6 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Bristol.pm b/perllib/FixMyStreet/Cobrand/Bristol.pm
index 6e3160c89..5e70c9456 100644
--- a/perllib/FixMyStreet/Cobrand/Bristol.pm
+++ b/perllib/FixMyStreet/Cobrand/Bristol.pm
@@ -52,7 +52,10 @@ sub categories_restriction {
     # Email categories with a devolved send_method, so can identify Open311
     # categories as those which have a blank send_method.
     # Also Highways England categories have a blank send_method.
-    return $rs->search( { 'me.send_method' => undef } );
+    return $rs->search( { -or => [
+        'me.send_method' => undef, # Open311 categories
+        'me.send_method' => '', # Open311 categories that have been edited in the admin
+    ] } );
 }
 
 sub open311_config {
@@ -68,8 +71,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}};
     }
 }