Fix bugs introduced with overrides form

3 files changed, 10 insertions, 10 deletions

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 1adba8482..6728ebef8 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -200,23 +200,23 @@ sub setup_dev_overrides {
     return unless $c->config->{STAGING_SITE};
 
     # Extract all the _override_xxx parameters
-    my $params = $c->req->parameters;
-    delete $params->{$_} for grep { !m{^_override_} } keys %$params;
+    my %params = %{ $c->req->parameters };
+    delete $params{$_} for grep { !m{^_override_} } keys %params;
 
     # stop if there is nothing to add
-    return 1 unless scalar keys %$params;
+    return 1 unless scalar keys %params;
 
     # Check to see if we should clear all
-    if ( $params->{_override_clear_all} ) {
+    if ( $params{_override_clear_all} ) {
         delete $c->session->{overrides};
         return;
     }
 
     # check for all the other _override params and set their values
     my $overrides = $c->session->{overrides} ||= {};
-    foreach my $raw_key ( keys %$params ) {
+    foreach my $raw_key ( keys %params ) {
         my ($key) = $raw_key =~ m{^_override_(.*)$};
-        $overrides->{$key} = $params->{$raw_key};
+        $overrides->{$key} = $params{$raw_key};
     }
 
     return $overrides;
diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm
index 04d825da7..3d011d708 100644
--- a/perllib/FixMyStreet/TestMech.pm
+++ b/perllib/FixMyStreet/TestMech.pm
@@ -256,9 +256,9 @@ Return all the visible form values on the page - ie not the hidden ones.
 sub visible_form_values {
     my $mech = shift;
 
-    my @forms = $mech->forms;
-
-    # insert form filtering here (eg ignore login form)
+    my @forms =
+      grep { ( $_->attr('name') || '' ) ne 'overrides_form' } # ignore overrides
+      $mech->forms;
 
     croak "Found no forms - can't continue..."
       unless @forms;
diff --git a/templates/web/default/debug_footer.html b/templates/web/default/debug_footer.html
index 2fd3de591..c19360132 100644
--- a/templates/web/default/debug_footer.html
+++ b/templates/web/default/debug_footer.html
@@ -21,7 +21,7 @@
 </style>
 
 <!-- Use a post so that we don't clutter up the url -->
-<form action="" method="post" id="overrides_form">
+<form action="" method="post" id="overrides_form" name="overrides_form">
 
     <label for="_override_clear_all">Clear all overrides:</label>
     <input type="checkbox" name="_override_clear_all" id="_override_clear_all" value="1"><br>