From c4b65d6af947f7fd3e8039619b2588abac595dcb Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Wed, 30 Mar 2016 17:39:19 +0100 Subject: [PATCH] Fix bug with creating the invited user permission list. --- app/main/views/manage_users.py | 4 +++- tests/app/main/views/test_manage_users.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/main/views/manage_users.py b/app/main/views/manage_users.py index 4f552731c..156775770 100644 --- a/app/main/views/manage_users.py +++ b/app/main/views/manage_users.py @@ -60,7 +60,9 @@ def invite_user(service_id): # view_activity is a default role to be added to all users. # All users will have at minimum view_activity to allow users to see notifications, # templates, team members but no update privileges - permissions = ','.join(role for role in roles.keys() if request.form.get(role) == 'y').join('view_activity') + selected_permissions = [role for role in roles.keys() if request.form.get(role) == 'y'] + selected_permissions.append('view_activity') + permissions = ','.join(selected_permissions) invited_user = invite_api_client.create_invite( current_user.id, service_id, diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index 0e8100882..88d370622 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -161,6 +161,10 @@ def test_invite_user( assert page.h1.string.strip() == 'Manage team' flash_banner = page.find('div', class_='banner-default-with-tick').string.strip() assert flash_banner == 'Invite sent to test@example.gov.uk' + app.invite_api_client.create_invite.assert_called_once_with(sample_invite['from_user'], + sample_invite['service'], + email_address, + sample_invite['permissions']+',view_activity') def test_cancel_invited_user_cancels_user_invitations(app_,