openstack/horizon
Code Issues Proposed changes

Merge "Port identity provider dashboard to Python 3"

Browse Source
This commit is contained in:
Jenkins 2016-02-10 02:01:40 +00:00 committed by Gerrit Code Review
commit 55465adb32
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
horizon/tables/base.py
View File

@ -1685,9 +1685,7 @@ class DataTable(object):
By default, this returns a ``name`` attribute from the given object, By default, this returns a ``name`` attribute from the given object,
but this can be overridden to return other values. but this can be overridden to return other values.
""" """
if hasattr(datum, 'name'): return getattr(datum, 'name', None)
return datum.name
return None
def has_prev_data(self): def has_prev_data(self):
"""Returns a boolean value indicating whether there is previous data """Returns a boolean value indicating whether there is previous data

2
openstack_dashboard/test/test_data/keystone_data.py
View File

@ -422,6 +422,6 @@ def data(TEST):
] ]
} }
idp_mapping = mappings.Mapping( idp_mapping = mappings.Mapping(
mappings.MappingManager, mappings.MappingManager(None),
idp_mapping_dict) idp_mapping_dict)
TEST.idp_mappings.add(idp_mapping) TEST.idp_mappings.add(idp_mapping)

1
tox.ini
View File

@ -29,6 +29,7 @@ commands =
openstack_dashboard.dashboards.admin.metering \ openstack_dashboard.dashboards.admin.metering \
openstack_dashboard.dashboards.admin.routers \ openstack_dashboard.dashboards.admin.routers \
openstack_dashboard.dashboards.admin.volumes.volumes.tests \ openstack_dashboard.dashboards.admin.volumes.volumes.tests \
openstack_dashboard.dashboards.identity.identity_providers \
openstack_dashboard.dashboards.identity.users \ openstack_dashboard.dashboards.identity.users \
openstack_dashboard.dashboards.project.access_and_security.api_access.tests \ openstack_dashboard.dashboards.project.access_and_security.api_access.tests \
openstack_dashboard.dashboards.project.containers \ openstack_dashboard.dashboards.project.containers \