diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | templates/web/base/report/new/form_user_loggedin.html | 4 | ||||
| -rw-r--r-- | templates/web/base/report/new/form_user_loggedout_by_email.html | 10 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/staff.js | 9 |
4 files changed, 17 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2767d93ff..448980129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Homepage postcode input is now marked up as a required input #2037 - Improved cursor/display of the new report pin. #2038 - Asset layers can be attached to more than one category each. #2049 + - Cobrands hook to remove phone number field. #2049 - Bugfixes: - Stop asset layers obscuring marker layer. #1999 - Don't delete hidden field values when inspecting reports. #1999 diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html index 6257a8346..efe19864c 100644 --- a/templates/web/base/report/new/form_user_loggedin.html +++ b/templates/web/base/report/new/form_user_loggedin.html @@ -29,7 +29,7 @@ </select> [% END %] -[% IF c.user.phone_verified %] +[% IF c.user.phone_verified AND NOT c.cobrand.call_hook('disable_phone_number_entry') %] <label for="form_phone">[% loc('Phone number') %]</label> <input class="form-control" id="form_phone" name="phone" disabled type="text" value="[% c.user.phone_display | html %]"> [% END %] @@ -63,7 +63,7 @@ <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %] </label> </div> -[% IF NOT c.user.phone_verified %] +[% IF NOT c.user.phone_verified AND NOT c.cobrand.call_hook('disable_phone_number_entry') %] <label for="form_phone">[% loc('Phone number (optional)') %]</label> <input class="form-control" type="text" value="[% report.user.phone_display | html %]" name="phone" id="form_phone"> [% END %] diff --git a/templates/web/base/report/new/form_user_loggedout_by_email.html b/templates/web/base/report/new/form_user_loggedout_by_email.html index 975dbe704..334bb0552 100644 --- a/templates/web/base/report/new/form_user_loggedout_by_email.html +++ b/templates/web/base/report/new/form_user_loggedout_by_email.html @@ -26,10 +26,12 @@ <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> </div> - <div id="js-hide-if-username-phone"> - <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label> - <input class="form-control form-focus-hidden" type="text" value="[% report.user.phone_display | html %]" name="phone" id="form_phone"> - </div> + [% UNLESS c.cobrand.call_hook('disable_phone_number_entry') %] + <div id="js-hide-if-username-phone"> + <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label> + <input class="form-control form-focus-hidden" type="text" value="[% report.user.phone_display | html %]" name="phone" id="form_phone"> + </div> + [% END %] <div id="js-hide-if-username-email"> <label class="form-focus-hidden" for="form_email">[% loc('Email address (optional)') %]</label> <input class="form-control form-focus-hidden" type="text" value="[% report.user.email | html %]" name="email" id="form_email"> diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js index dd65bc3ce..134f57a7f 100644 --- a/web/cobrands/fixmystreet/staff.js +++ b/web/cobrands/fixmystreet/staff.js @@ -185,7 +185,14 @@ $.extend(fixmystreet.set_up, { $addAlertCheckbox.prop('checked', true).prop('disabled', false); } else if (val === 'another_user') { $emailInput.val('').prop('disabled', false); - $emailOptionalLabel.removeClass('hidden'); + if (!$phoneInput.length) { + // Cobrand may have disabled collection of phone numbers. + $emailOptionalLabel.addClass('hidden'); + $emailInput.addClass('required'); + } else { + $emailOptionalLabel.removeClass('hidden'); + $emailInput.removeClass('required'); + } $nameInput.val('').prop('disabled', false); $phoneInput.val('').prop('disabled', false); $showNameCheckbox.prop('checked', false).prop('disabled', true); |