Merge pull request #2794 from alphagov/edit_user_email

Allow users with "manage_service" permission to edit team members' email addresses

app/templates/views/edit-user-permissions.html

@@ -14,7 +14,7 @@
   </h1>
 
   <p>
-    {{ user.email_address }}
+    {{ user.email_address }}&emsp;<a href="{{ url_for('.edit_user_email', service_id=current_service.id, user_id=user.id)}}">Change</a>
   </p>
 
   <div class="grid-row">

app/templates/views/manage-users.html

@@ -63,7 +63,7 @@
               {% if user.status == 'pending' %}
                 <a href="{{ url_for('.cancel_invited_user', service_id=current_service.id, invited_user_id=user.id)}}">Cancel invitation</a>
               {% elif user.state == 'active' and current_user.id != user.id %}
-                <a href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id)}}">Edit permissions</a>
+                <a href="{{ url_for('.edit_user_permissions', service_id=current_service.id, user_id=user.id)}}">Edit team member</a>
               {% endif %}
             </li>
           {% endif %}

app/templates/views/manage-users/confirm-edit-user-email.html

@@ -0,0 +1,30 @@
+{% extends "withnav_template.html" %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/form.html" import form_wrapper %}
+
+{% block per_page_title %}
+  Confirm change of email address
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<h1 class="heading-large">Confirm change of email address</h1>
+
+<div class="grid-row">
+  <div class="column-whole">
+  {% call form_wrapper() %}
+    <p>New email address:</p>
+    <div class="panel panel-border-wide bottom-gutter">
+      <p>{{ new_email }}</p>
+    </div>
+    <p>We will send {{ user.name }} an email to tell them about the change.</p>
+    {{ page_footer(
+      'Confirm',
+      destructive=destructive,
+      back_link=url_for('.edit_user_email', service_id=service_id, user_id=user.id)
+    ) }}
+  {% endcall %}
+  </div>
+</div>
+
+{% endblock %}

app/templates/views/manage-users/edit-user-email.html

@@ -0,0 +1,27 @@
+{% extends "withnav_template.html" %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/form.html" import form_wrapper %}
+
+{% block per_page_title %}
+  Change team member’s email address
+{% endblock %}
+
+{% block maincolumn_content %}
+
+  <h1 class="heading-large">Change team member’s email address</h1>
+  <p id="user_name">This will change the email address for {{ user.name }}.</p>
+  <div class="grid-row">
+    <div class="column-three-quarters">
+      {% call form_wrapper() %}
+        {{ textbox(form.email_address) }}
+        {{ page_footer(
+          'Save',
+          back_link=url_for('.edit_user_permissions', service_id=service_id, user_id=user.id),
+          back_link_text="Back"
+        ) }}
+      {% endcall %}
+    </div>
+  </div>
+
+{% endblock %}