diff options
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 6 | ||||
| -rw-r--r-- | t/open311/getservicerequestupdates.t | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 8944a9307..10c869aee 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -1578,9 +1578,9 @@ sub generate_category_extra_json : Private { my @fields = map { { %$_, - required => $_->{required} eq "true" ? $true : $false, - variable => $_->{variable} eq "true" ? $true : $false, - order => int($_->{order}), + required => ($_->{required} || '') eq "true" ? $true : $false, + variable => ($_->{variable} || '') eq "true" ? $true : $false, + order => int($_->{order} || 0), } } @{ $c->stash->{category_extras}->{$c->stash->{category}} }; diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t index f680985a4..c3ce2118a 100644 --- a/t/open311/getservicerequestupdates.t +++ b/t/open311/getservicerequestupdates.t @@ -1086,7 +1086,11 @@ subtest 'check matching on fixmystreet_id overrides service_request_id' => sub { system_user => $user, ); - $update->update_comments( $o, $bodies{2482} ); + warning_like { + $update->update_comments( $o, $bodies{2482} ) + } + qr/Failed to match comment to problem with fixmystreet id @{[$problem->external_id]} for Bromley/, + "warning emitted for bad fixmystreet id"; $problem->discard_changes; is $problem->comments->count, 2, 'two comments after fetching updates'; |