x/tuskar-ui
Code Issues Proposed changes

Merge "rename "enable" action to "toggle""

Browse Source
This commit is contained in:
Jenkins
2013-07-22 10:17:04 +00:00
committed by Gerrit Code Review
parent ef8ca80344 4c847ed34b
commit abbce256b6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/admin/users/tables.py
View File

@@ -36,12 +36,12 @@ class EditUserLink(tables.LinkAction):
class ToggleEnabled(tables.BatchAction):
name = "enable"
name = "toggle"
action_present = (_("Enable"), _("Disable"))
action_past = (_("Enabled"), _("Disabled"))
data_type_singular = _("User")
data_type_plural = _("Users")
classes = ("btn-enable",)
classes = ("btn-toggle",)
def allowed(self, request, user=None):
if not api.keystone.keystone_can_edit_user():

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

@@ -327,7 +327,7 @@ class UsersViewTests(test.BaseAdminViewTests):
self.mox.ReplayAll()
formData = {'action': 'users__enable__%s' % user.id}
formData = {'action': 'users__toggle__%s' % user.id}
res = self.client.post(USERS_INDEX_URL, formData)
self.assertRedirectsNoFollow(res, USERS_INDEX_URL)
@@ -348,7 +348,7 @@ class UsersViewTests(test.BaseAdminViewTests):
self.mox.ReplayAll()
formData = {'action': 'users__enable__%s' % user.id}
formData = {'action': 'users__toggle__%s' % user.id}
res = self.client.post(USERS_INDEX_URL, formData)
self.assertRedirectsNoFollow(res, USERS_INDEX_URL)
@@ -366,7 +366,7 @@ class UsersViewTests(test.BaseAdminViewTests):
.AndRaise(self.exceptions.keystone)
self.mox.ReplayAll()
formData = {'action': 'users__enable__%s' % user.id}
formData = {'action': 'users__toggle__%s' % user.id}
res = self.client.post(USERS_INDEX_URL, formData)
self.assertRedirectsNoFollow(res, USERS_INDEX_URL)
@@ -381,7 +381,7 @@ class UsersViewTests(test.BaseAdminViewTests):
self.mox.ReplayAll()
formData = {'action': 'users__enable__%s' % self.request.user.id}
formData = {'action': 'users__toggle__%s' % self.request.user.id}
res = self.client.post(USERS_INDEX_URL, formData, follow=True)
self.assertEqual(list(res.context['messages'])[0].message,