Merge branch 'open311-populate-skip-body' into commercial-staging

CHANGELOG.md

@@ -55,6 +55,7 @@
         - Cobrands can provide per-category custom distances for duplicate lookup. #4746 #5162
         - Add perl 5.38 support.
         - Add plain text template previews to /_dev/email. #5105
+        - Add --exclude option to bin/open311-populate-service-list
     - Performance improvements:
         - Reduce database queries on shortlist page.
         - Provide ResultSet fallback translation in lookup.

bin/open311-populate-service-list

@@ -17,6 +17,7 @@ use Getopt::Long::Descriptive;
 my ($opt, $usage) = describe_options(
     '%c %o',
     ['body|b:s',   "body name to only fetch this body"],
+    ['exclude|e:s@', 'body name(s) to exclude from fetching' ],
     ['verbose|v',  "print out all services as they are found"],
     ['warn|w',     "output warnings about any issues"],
     ['help',       "print usage message and exit" ],
@@ -29,6 +30,9 @@ my $bodies = FixMyStreet::DB->resultset('Body')->search( {
 if ($opt->body) {
     $bodies = $bodies->search({ name => $opt->body });
 }
+if (my $exclude = $opt->exclude) {
+    $bodies = $bodies->search({ name => { -not_in => $exclude } });
+}
 
 my $verbose = 0;
 $verbose = 1 if $opt->warn;

templates/web/base/admin/reports/_edit_main.html

@@ -171,6 +171,9 @@
 <div class="clearfix full-width" style="background-color: #eee; padding: 1em 1em 0;">
 [% IF problem.user.email == cobrand.anonymous_account.email %]
     <p>[% loc('User:') %] [% loc('Anonymous user') %]</p>
+    <input type='hidden' name='name' value='[% problem.name %]'></li>
+    <input type='hidden' name='username' value='[% problem.user.username %]'>
+    <input type='hidden' name='anonymous' value='[% IF problem.anonymous %]1[% ELSE %]0[% END %]'>
 [% ELSE %]
 
   [% IF allowed_pages.user_edit %]