aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--t/app/controller/admin/users.t14
-rw-r--r--templates/web/base/admin/user-form.html8
2 files changed, 14 insertions, 8 deletions
diff --git a/t/app/controller/admin/users.t b/t/app/controller/admin/users.t
index 63295e26d..8759e260d 100644
--- a/t/app/controller/admin/users.t
+++ b/t/app/controller/admin/users.t
@@ -200,8 +200,10 @@ FixMyStreet::override_config {
fields => {
name => '',
email => 'test@example.com',
+ email_verified => 1,
body => $haringey->id,
phone => '',
+ phone_verified => undef,
flagged => undef,
is_superuser => undef,
area_id => '',
@@ -218,8 +220,10 @@ FixMyStreet::override_config {
fields => {
name => 'Changed User',
email => 'test@example.com',
+ email_verified => 1,
body => $haringey->id,
phone => '',
+ phone_verified => undef,
flagged => undef,
is_superuser => undef,
area_id => '',
@@ -236,8 +240,10 @@ FixMyStreet::override_config {
fields => {
name => 'Changed User',
email => 'changed@example.com',
+ email_verified => 1,
body => $haringey->id,
phone => '',
+ phone_verified => undef,
flagged => undef,
is_superuser => undef,
area_id => '',
@@ -254,8 +260,10 @@ FixMyStreet::override_config {
fields => {
name => 'Changed User',
email => 'changed@example.com',
+ email_verified => 1,
body => $southend->id,
phone => '',
+ phone_verified => undef,
flagged => undef,
is_superuser => undef,
area_id => '',
@@ -272,8 +280,10 @@ FixMyStreet::override_config {
fields => {
name => 'Changed User',
email => 'changed@example.com',
+ email_verified => 1,
body => $southend->id,
phone => '',
+ phone_verified => undef,
flagged => 'on',
is_superuser => undef,
area_id => '',
@@ -290,8 +300,10 @@ FixMyStreet::override_config {
fields => {
name => 'Changed User',
email => 'changed@example.com',
+ email_verified => 1,
body => $southend->id,
phone => '',
+ phone_verified => undef,
flagged => undef,
is_superuser => undef,
area_id => '',
@@ -311,8 +323,10 @@ FixMyStreet::override_config {
fields => {
name => 'Changed User',
email => 'changed@example.com',
+ email_verified => 1,
body => $southend->id,
phone => '',
+ phone_verified => undef,
flagged => undef,
is_superuser => 'on',
area_id => '',
diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html
index 9dc14c98d..e8e647a09 100644
--- a/templates/web/base/admin/user-form.html
+++ b/templates/web/base/admin/user-form.html
@@ -18,20 +18,12 @@
</li>
<li><label for="email">[% loc('Email:') %]</label>
<input type='text' class="form-control" id='email' name='email' value='[% user.email | html %]'></li>
- [% IF c.config.SMS_AUTHENTICATION %]
<li><label class="inline" for="email_verified">[% loc('Email verified:') %]</label>
<input type="checkbox" id="email_verified" name="email_verified" value="1" [% user.email_verified ? ' checked' : '' %]>
- [% ELSE %]
- <input type="hidden" name="email_verified" value="1">
- [% END %]
<li><label for="phone">[% loc('Phone:') %]</label>
<input type='text' class="form-control" id='phone' name='phone' value='[% user.phone | html %]'></li>
- [% IF c.config.SMS_AUTHENTICATION %]
<li><label class="inline" for="phone_verified">[% loc('Phone verified:') %]</label>
<input type="checkbox" id="phone_verified" name="phone_verified" value="1" [% user.phone_verified ? ' checked' : '' %]>
- [% ELSE %]
- <input type="hidden" name="phone_verified" value="0">
- [% END %]
[% IF username_in_abuse %]
<li>