Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for value labels in email where value is 0. #5387

Merged
merged 1 commit into from
Feb 26, 2025
Merged

Fix for value labels in email where value is 0. #5387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion t/cobrand/bristol.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ my $flytipping = $mech->create_contact_ok(
{ key => 0, name => 'No' },
{ key => 1, name => 'Yes' },
] },
{ code => 'Size', values => [
{ key => 0, name => 'Small' },
{ key => 1, name => 'Medium' },
{ key => 2, name => 'Large' },
] },
]
}
);
Expand Down Expand Up @@ -234,7 +239,10 @@ FixMyStreet::override_config {
my ($p) = $mech->create_problems_for_body(1, $bristol->id, 'Title', {
cobrand => 'bristol',
category => $flytipping->category,
extra => { _fields => [ { name => 'Witness', value => 1 } ] },
extra => { _fields => [
{ name => 'Witness', value => 1 },
{ name => 'Size', value => "0" },
] },
} );

FixMyStreet::Script::Reports::send();
Expand All @@ -245,6 +253,7 @@ FixMyStreet::override_config {
is $p->get_extra_metadata('extra_email_sent'), 1;
my $email = $mech->get_text_body_from_email;
like $email, qr/Witness: Yes/;
like $email, qr/Size: Small/;
};

subtest "usrn populated on Alloy category" => sub {
Expand Down
2 changes: 1 addition & 1 deletion templates/email/buckinghamshire/submit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
[% report.detail | html_para_email(secondary_p_style) %]
[% IF report.get_extra_fields %]
<p style="[% secondary_p_style %]">
[%~ FOR field IN report.get_extra_fields %][% IF field.value %]
[%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
[% field.description OR field.name %]: [% field.value_label OR field.value %]
[% IF NOT loop.last %]<br>[% END %]
[%~ END %][% END %]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/buckinghamshire/submit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Subject: [% report.title %]

Details: [% report.detail %]

[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
[% field.description OR field.name %]: [% field.value_label OR field.value %]

[% END %][% END ~%]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/default/cy/submit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
[% report.detail | html_para_email(secondary_p_style) %]
[% IF report.get_extra_fields %]
<p style="[% secondary_p_style %]">
[%~ FOR field IN report.get_extra_fields %][% IF field.value %]
[%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
[% field.description OR field.name %]: [% field.value_label OR field.value %]
[% IF NOT loop.last %]<br>[% END %]
[%~ END %][% END %]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/default/cy/submit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Pwnc: [% report.title %]

Manylion: [% report.detail %]

[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
[% field.description OR field.name %]: [% field.value_label OR field.value %]

[% END %][% END ~%]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/default/submit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
[% report.detail | html_para_email(secondary_p_style) %]
[% IF report.get_extra_fields %]
<p style="[% secondary_p_style %]">
[%~ FOR field IN report.get_extra_fields %][% IF field.value %]
[%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
[% field.description OR field.name %]: [% field.value_label OR field.value %]
[% IF NOT loop.last %]<br>[% END %]
[%~ END %][% END %]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/default/submit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Subject: [% report.title %]

Details: [% report.detail %]

[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
[% field.description OR field.name %]: [% field.value_label OR field.value %]

[% END %][% END ~%]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/fixmystreet.com/cy/submit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
[% report.detail | html_para_email(secondary_p_style) %]
[% IF report.get_extra_fields %]
<p style="[% secondary_p_style %]">
[%~ FOR field IN report.get_extra_fields %][% IF field.value %]
[%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
[% field.description OR field.name %]: [% field.value_label OR field.value %]
[% IF NOT loop.last %]<br>[% END %]
[%~ END %][% END %]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/fixmystreet.com/cy/submit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Pwnc: [% report.title %]

Manylion: [% report.detail %]

[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
[% field.description OR field.name %]: [% field.value_label OR field.value %]

[% END %][% END ~%]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/fixmystreet.com/submit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
[% report.detail | html_para_email(secondary_p_style) %]
[% IF report.get_extra_fields %]
<p style="[% secondary_p_style %]">
[%~ FOR field IN report.get_extra_fields %][% IF field.value %]
[%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
<strong>[% field.description OR field.name %]:</strong> [% field.value_label OR field.value %]
[% IF NOT loop.last %]<br>[% END %]
[%~ END %][% END %]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/fixmystreet.com/submit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Subject: [% report.title %]

Details: [% report.detail %]

[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
[% field.description OR field.name %]: [% field.value_label OR field.value %]

[% END %][% END ~%]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/highwaysengland/submit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
</p>
[% IF report.get_extra_fields %]
<p style="[% secondary_p_style %]">
[%~ FOR field IN report.get_extra_fields %][% IF field.value %]
[%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
<strong>[% field.description OR field.name %]:</strong> [% field.value_label OR field.value %]
[% IF NOT loop.last %]<br>[% END %]
[%~ END %][% END %]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/highwaysengland/submit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Latitude: [% report.latitude %]

Longitude: [% report.longitude %]

[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
[% field.description OR field.name %]: [% field.value_label OR field.value %]

[% END %][% END ~%]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/nottinghamshirepolice/submit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h2 style="[% h2_style %]">[% report.title | html %]</h2>
[% report.detail | html_para_email(secondary_p_style) %]
[% IF report.get_extra_fields %]
<p style="[% secondary_p_style %]">
[%~ FOR field IN report.get_extra_fields %][% IF field.value %]
[%~ FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length %]
[% field.description OR field.name %]: [% field.value_label OR field.value %]
[% IF NOT loop.last %]<br>[% END %]
[%~ END %][% END %]
Expand Down
2 changes: 1 addition & 1 deletion templates/email/nottinghamshirepolice/submit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Subject: [% report.title %]

Details: [% report.detail %]

[% FOR field IN report.get_extra_fields %][% IF field.value ~%]
[% FOR field IN report.get_extra_fields %][% IF field.value_label OR field.value.length ~%]
[% field.description OR field.name %]: [% field.value_label OR field.value %]

[% END %][% END ~%]
Expand Down
Loading