Merge branch 'master' into email_from_uniqueness

This commit is contained in:
Rebecca Law
2016-03-31 08:37:11 +01:00
3 changed files with 13 additions and 4 deletions

View File

@@ -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 sorted(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,