Manage user pages now surfaces invited users

fetched from api.
This commit is contained in:
Adam Shimali
2016-02-26 15:33:17 +00:00
parent 9730db0e89
commit c76717942f
6 changed files with 57 additions and 15 deletions

View File

@@ -34,14 +34,19 @@ fake_users = [
@main.route("/services/<service_id>/users")
@login_required
def manage_users(service_id):
users = user_api_client.get_users_for_service(service_id=service_id)
return render_template(
'views/manage-users.html',
service_id=service_id,
users=users,
current_user=current_user,
invited_users=[]
)
try:
users = user_api_client.get_users_for_service(service_id=service_id)
invited_users = invite_api_client.get_invites_for_service(service_id=service_id)
return render_template('views/manage-users.html',
service_id=service_id,
users=users,
current_user=current_user,
invited_users=invited_users)
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
@main.route("/services/<service_id>/users/invite", methods=['GET', 'POST'])

View File

@@ -21,3 +21,8 @@ class InviteApiClient(BaseAPIClient):
}
resp = self.post(url='/service/{}/invite'.format(service_id), data=data)
return resp['data']
def get_invites_for_service(self, service_id):
endpoint = '/service/{}/invite'.format(service_id)
resp = self.get(endpoint)
return resp['data']

View File

@@ -41,7 +41,7 @@ Manage users GOV.UK Notify
invited_users, caption='Invited', **table_options
) %}
{% call field() %}
{{ item.email_localpart }}
{{ item.email_address }}
{% endcall %}
{{ boolean_field(item.permission_send_messages) }}
{{ boolean_field(item.permission_manage_service) }}