diff --git a/superset/views.py b/superset/views.py index 0dcee47908a..b3cb78c7f87 100755 --- a/superset/views.py +++ b/superset/views.py @@ -1139,12 +1139,12 @@ class Superset(BaseSupersetView): def update_role(self): """Assigns a list of found users to the given role.""" data = request.get_json(force=True) - user_emails = data['user_emails'] + usernames = data['usernames'] role_name = data['role_name'] role = sm.find_role(role_name) role.user = [] - for user_email in user_emails: - user = sm.find_user(email=user_email) + for username in usernames: + user = sm.find_user(username=username) if user: role.user.append(user) db.session.commit() diff --git a/tests/access_tests.py b/tests/access_tests.py index 043e3249495..f57d2669829 100644 --- a/tests/access_tests.py +++ b/tests/access_tests.py @@ -358,7 +358,7 @@ class RequestAccessTests(SupersetTestCase): self.get_resp( '/superset/update_role/', data=json.dumps({ - 'user_emails': ['gamma@fab.org'], + 'usernames': ['gamma'], 'role_name': update_role_str, }) ) @@ -370,20 +370,20 @@ class RequestAccessTests(SupersetTestCase): resp = self.client.post( '/superset/update_role/', data=json.dumps({ - 'user_emails': ['gamma@fab.org'], + 'usernames': ['gamma'], 'role_name': update_role_str }), follow_redirects=True ) update_role = sm.find_role(update_role_str) self.assertEquals( - update_role.user, [sm.find_user(email='gamma@fab.org')]) + update_role.user, [sm.find_user(username='gamma')]) self.assertEquals(resp.status_code, 201) resp = self.client.post( '/superset/update_role/', data=json.dumps({ - 'user_emails': ['alpha@fab.org', 'unknown@fab.org'], + 'usernames': ['alpha', 'unknown'], 'role_name': update_role_str }), follow_redirects=True @@ -391,7 +391,7 @@ class RequestAccessTests(SupersetTestCase): self.assertEquals(resp.status_code, 201) update_role = sm.find_role(update_role_str) self.assertEquals( - update_role.user, [sm.find_user(email='alpha@fab.org')]) + update_role.user, [sm.find_user(username='alpha')]) db.session.delete(update_role) db.session.commit()