openstack/horizon
Code Issues Proposed changes

Merge "List only projects accessible by user"

Browse Source
This commit is contained in:
Jenkins 2013-06-12 10:49:04 +00:00 committed by Gerrit Code Review
commit 2b0d3d54aa
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/dashboards/admin/users/forms.py
View File

@ -41,7 +41,10 @@ class BaseUserForm(forms.SelfHandlingForm):
# Populate project choices # Populate project choices
project_choices = [('', _("Select a project"))] project_choices = [('', _("Select a project"))]
projects, has_more = api.keystone.tenant_list(request) # If the user is already set (update action), list only projects which
# the user has access to.
user_id = kwargs['initial'].get('id', None)
projects, has_more = api.keystone.tenant_list(request, user=user_id)
for project in projects: for project in projects:
if project.enabled: if project.enabled:
project_choices.append((project.id, project.name)) project_choices.append((project.id, project.name))

20
openstack_dashboard/dashboards/admin/users/tests.py
View File

@ -55,7 +55,7 @@ class UsersViewTests(test.BaseAdminViewTests):
user = self.users.get(id="1") user = self.users.get(id="1")
role = self.roles.first() role = self.roles.first()
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=None) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
api.keystone.user_create(IgnoreArg(), api.keystone.user_create(IgnoreArg(),
user.name, user.name,
@ -88,7 +88,7 @@ class UsersViewTests(test.BaseAdminViewTests):
def test_create_with_password_mismatch(self): def test_create_with_password_mismatch(self):
user = self.users.get(id="1") user = self.users.get(id="1")
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=None) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
api.keystone.role_list(IgnoreArg()).AndReturn(self.roles.list()) api.keystone.role_list(IgnoreArg()).AndReturn(self.roles.list())
api.keystone.get_default_role(IgnoreArg()) \ api.keystone.get_default_role(IgnoreArg()) \
@ -114,7 +114,7 @@ class UsersViewTests(test.BaseAdminViewTests):
def test_create_validation_for_password_too_short(self): def test_create_validation_for_password_too_short(self):
user = self.users.get(id="1") user = self.users.get(id="1")
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=None) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
api.keystone.role_list(IgnoreArg()).AndReturn(self.roles.list()) api.keystone.role_list(IgnoreArg()).AndReturn(self.roles.list())
api.keystone.get_default_role(IgnoreArg()) \ api.keystone.get_default_role(IgnoreArg()) \
@ -143,7 +143,7 @@ class UsersViewTests(test.BaseAdminViewTests):
def test_create_validation_for_password_too_long(self): def test_create_validation_for_password_too_long(self):
user = self.users.get(id="1") user = self.users.get(id="1")
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=None) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
api.keystone.role_list(IgnoreArg()).AndReturn(self.roles.list()) api.keystone.role_list(IgnoreArg()).AndReturn(self.roles.list())
api.keystone.get_default_role(IgnoreArg()) \ api.keystone.get_default_role(IgnoreArg()) \
@ -178,7 +178,7 @@ class UsersViewTests(test.BaseAdminViewTests):
api.keystone.user_get(IsA(http.HttpRequest), '1', api.keystone.user_get(IsA(http.HttpRequest), '1',
admin=True).AndReturn(user) admin=True).AndReturn(user)
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=user.id) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
api.keystone.user_update(IsA(http.HttpRequest), api.keystone.user_update(IsA(http.HttpRequest),
user.id, user.id,
@ -212,7 +212,7 @@ class UsersViewTests(test.BaseAdminViewTests):
api.keystone.user_get(IsA(http.HttpRequest), api.keystone.user_get(IsA(http.HttpRequest),
'1', '1',
admin=True).AndReturn(user) admin=True).AndReturn(user)
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=user.id) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
api.keystone.keystone_can_edit_user().AndReturn(False) api.keystone.keystone_can_edit_user().AndReturn(False)
api.keystone.keystone_can_edit_user().AndReturn(False) api.keystone.keystone_can_edit_user().AndReturn(False)
@ -235,7 +235,7 @@ class UsersViewTests(test.BaseAdminViewTests):
api.keystone.user_get(IsA(http.HttpRequest), '1', api.keystone.user_get(IsA(http.HttpRequest), '1',
admin=True).AndReturn(user) admin=True).AndReturn(user)
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=user.id) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
self.mox.ReplayAll() self.mox.ReplayAll()
@ -260,7 +260,7 @@ class UsersViewTests(test.BaseAdminViewTests):
api.keystone.user_get(IsA(http.HttpRequest), '1', api.keystone.user_get(IsA(http.HttpRequest), '1',
admin=True).AndReturn(user) admin=True).AndReturn(user)
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=user.id) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
self.mox.ReplayAll() self.mox.ReplayAll()
@ -361,7 +361,7 @@ class SeleniumTests(test.SeleniumAdminTestCase):
'role_list', 'role_list',
'user_list')}) 'user_list')})
def test_modal_create_user_with_passwords_not_matching(self): def test_modal_create_user_with_passwords_not_matching(self):
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=None) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
api.keystone.role_list(IgnoreArg()).AndReturn(self.roles.list()) api.keystone.role_list(IgnoreArg()).AndReturn(self.roles.list())
api.keystone.user_list(IgnoreArg()).AndReturn(self.users.list()) api.keystone.user_list(IgnoreArg()).AndReturn(self.users.list())
@ -393,7 +393,7 @@ class SeleniumTests(test.SeleniumAdminTestCase):
def test_update_user_with_passwords_not_matching(self): def test_update_user_with_passwords_not_matching(self):
api.keystone.user_get(IsA(http.HttpRequest), '1', api.keystone.user_get(IsA(http.HttpRequest), '1',
admin=True).AndReturn(self.user) admin=True).AndReturn(self.user)
api.keystone.tenant_list(IgnoreArg()) \ api.keystone.tenant_list(IgnoreArg(), user=self.user.id) \
.AndReturn([self.tenants.list(), False]) .AndReturn([self.tenants.list(), False])
self.mox.ReplayAll() self.mox.ReplayAll()