aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2011-05-20 12:00:53 +0100
committerStruan Donald <struan@exo.org.uk>2011-05-20 12:33:03 +0100
commitce75c68071fc362b986cdc1b64695f50f9c2bf72 (patch)
treeabbe4a7b77c3a4421f9bf075a4cdb885e7cbc4e0
parent0a2075c106083b6b3b7c8b37b04df9b155aed1fb (diff)
default add_alerts to on
-rw-r--r--perllib/FixMyStreet/App/Controller/Report.pm13
-rw-r--r--t/app/controller/report_display.t2
-rw-r--r--t/app/controller/report_updates.t9
3 files changed, 17 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index 34af1a327..35b699f5d 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -197,10 +197,15 @@ sub format_problem_for_display : Private {
$c->stash->{report_name} = $c->req->param('name');
- $c->stash->{update} = $c->req->param('update');
- $c->stash->{email} = $c->req->param('rznvy');
- $c->stash->{fixed} = $c->req->param('fixed') ? ' checked' : '';
- $c->stash->{add_alert} = $c->req->param('add_alert') ? ' checked' : '';
+ if ( $c->req->param('submit_update' ) ) {
+ $c->stash->{update} = $c->req->param('update');
+ $c->stash->{email} = $c->req->param('rznvy');
+ $c->stash->{fixed} = $c->req->param('fixed') ? ' checked' : '';
+ $c->stash->{add_alert} = $c->req->param('add_alert') ? ' checked' : '';
+ } else {
+ $c->stash->{add_alert} = ' checked';
+ }
+
$c->forward('generate_map_tags');
$c->forward('generate_problem_meta');
diff --git a/t/app/controller/report_display.t b/t/app/controller/report_display.t
index 7be9f387e..aa7e507d9 100644
--- a/t/app/controller/report_display.t
+++ b/t/app/controller/report_display.t
@@ -113,7 +113,7 @@ subtest "test a good report" => sub {
name => '',
rznvy => '',
update => '',
- add_alert => undef,
+ add_alert => 1, # defaults to true
fixed => undef
);
is $update_form->value($_), $fields{$_}, "$_ value" for keys %fields;
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index f1717a64e..7f6f4dc1a 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -224,8 +224,10 @@ subtest "submit an update for a non registered user" => sub {
$mech->submit_form_ok(
{
with_fields => {
+ submit_update => 1,
rznvy => 'unregistered@example.com',
- update => 'update from an unregistered user'
+ update => 'update from an unregistered user',
+ add_alert => 0,
}
},
'submit update'
@@ -266,8 +268,10 @@ for my $test (
{
desc => 'submit update for register user',
fields => {
+ submit_update => 1,
rznvy => 'test@example.com',
- update => 'update from a registered user'
+ update => 'update from a registered user',
+ add_alert => 0,
},
changed => {
update => 'Update from a registered user'
@@ -277,6 +281,7 @@ for my $test (
{
desc => 'submit update for register user and sign up',
fields => {
+ submit_update => 1,
rznvy => 'test@example.com',
update => 'update from a registered user',
add_alert => 1,