From e483dd047b0466abba13371a6730c2b2ad463354 Mon Sep 17 00:00:00 2001 From: Cindy Lu Date: Fri, 7 Oct 2016 13:32:35 -0700 Subject: [PATCH] Project table has an extra Enabled column definition There are two Enabled column definitions, remove the one attached to v3 enabled (unrelated to v3 too). Closes-Bug: #1633288 Change-Id: I8ba74eba843b72ba1d55c5237d2972c45057afb7 --- .../dashboards/identity/projects/tables.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/openstack_dashboard/dashboards/identity/projects/tables.py b/openstack_dashboard/dashboards/identity/projects/tables.py index 7cd2cedcb9..e80bb3e7de 100644 --- a/openstack_dashboard/dashboards/identity/projects/tables.py +++ b/openstack_dashboard/dashboards/identity/projects/tables.py @@ -226,22 +226,17 @@ class TenantsTable(tables.DataTable): widget=forms.Textarea(attrs={'rows': 4}), required=False)) id = tables.Column('id', verbose_name=_('Project ID')) + + if api.keystone.VERSIONS.active >= 3: + domain_name = tables.Column( + 'domain_name', verbose_name=_('Domain Name')) + enabled = tables.Column('enabled', verbose_name=_('Enabled'), status=True, filters=(filters.yesno, filters.capfirst), form_field=forms.BooleanField( label=_('Enabled'), required=False)) - if api.keystone.VERSIONS.active >= 3: - domain_name = tables.Column( - 'domain_name', verbose_name=_('Domain Name')) - enabled = tables.Column('enabled', verbose_name=_('Enabled'), - status=True, - filters=(filters.yesno, filters.capfirst), - form_field=forms.BooleanField( - label=_('Enabled'), - required=False)) - def get_project_detail_link(self, project): # this method is an ugly monkey patch, needed because # the column link method does not provide access to the request