diff options
| -rw-r--r-- | templates/web/base/admin/contact-form.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/reports/summary.html | 6 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/admin.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/web/base/admin/contact-form.html b/templates/web/base/admin/contact-form.html index 24021ebf3..b34ca3377 100644 --- a/templates/web/base/admin/contact-form.html +++ b/templates/web/base/admin/contact-form.html @@ -27,7 +27,7 @@ [% loc("The <strong>email address</strong> is the destination to which reports about this category will be sent. Other categories for this body may have the same email address.") %] </p> - [% IF (body.send_method AND body.send_method != 'Email') OR body.can_be_devolved %] + [% IF (body.send_method AND body.send_method.match('Email')) OR body.can_be_devolved %] <p> [% loc("If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here.") %] </p> diff --git a/templates/web/fixmystreet.com/reports/summary.html b/templates/web/fixmystreet.com/reports/summary.html index 1b48d68b4..96d326ce7 100644 --- a/templates/web/fixmystreet.com/reports/summary.html +++ b/templates/web/fixmystreet.com/reports/summary.html @@ -12,7 +12,7 @@ <h1>[% loc('Dashboard') %] – [% body.name %]</h1> </div> -[% IF body.send_method == 'Email' OR body.send_method == '' %] +[% IF body.send_method.match('Email') OR body.send_method == '' %] <div class="dashboard-row"> <div class="dashboard-item dashboard-item--12"> <div class="healthcheck-unit healthcheck-unit--good"> @@ -171,7 +171,7 @@ </div> </div> -[% IF body.send_method == 'Email' OR body.send_method == '' %] +[% IF body.send_method.match('Email') OR body.send_method == '' %] <div class="dashboard-row dashboard-row--yellow"> <div class="dashboard-item dashboard-item--12 dashboard-fms-case-studies"> <h2 style="margin-bottom: 1em">How FixMyStreet Pro helps other councils</h2> @@ -206,7 +206,7 @@ <p> [% tprintf( loc('Reports are currently not being sent to %s.'), body.name ) %] </p> - [% ELSIF body.send_method != 'Email' AND body.send_method != '' %] + [% ELSIF NOT body.send_method.match('Email') AND body.send_method != '' %] <p> [% tprintf( loc('Reports to %s are currently sent directly into backend services.'), body.name) %] </p> diff --git a/web/cobrands/fixmystreet/admin.js b/web/cobrands/fixmystreet/admin.js index 5c0378ad2..3066ee614 100644 --- a/web/cobrands/fixmystreet/admin.js +++ b/web/cobrands/fixmystreet/admin.js @@ -10,7 +10,7 @@ $(function(){ var show_open311 = false; if ($form.find('[name=endpoint]').val()) { show_open311 = true; // always show the form if there is an endpoint value - } else if (send_method && !send_method.match(/^(email|noop|refused)$/i)) { + } else if (send_method && !send_method.match(/email|^noop$|^refused$/i)) { show_open311 = true; } if (show_open311) { |