openstack
/
congress-dashboard
Code Issues Proposed changes

Atomic rules to be displayed in UI 

This commit enables atomic rules table rows to be displayed in UI

Change-Id: I8859815339193a190863429c877555d9a2d205d7
Closes-Bug:#1705677
This commit is contained in:
Anusha Ramineni 2017-07-24 15:25:24 +05:30
parent 12e50f3079
commit edc3b79d34
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
congress_dashboard/datasources/views.py
View File

@ -172,6 +172,7 @@ class DetailView(tables.DataTableView):
column_names = [] column_names = []
table_class_attrs = copy.deepcopy(dict(self.table_class.__dict__)) table_class_attrs = copy.deepcopy(dict(self.table_class.__dict__))
# Get schema from the server. # Get schema from the server.
schema = {}
try: try:
if is_service: if is_service:
schema = congress.datasource_table_schema_get( schema = congress.datasource_table_schema_get(
@ -180,22 +181,15 @@ class DetailView(tables.DataTableView):
schema = congress.policy_table_schema_get( schema = congress.policy_table_schema_get(
self.request, datasource_id, table_name) self.request, datasource_id, table_name)
except Exception as e: except Exception as e:
msg_args = { # Unable to get the schema, might be atomic rule, just display
'table_name': table_name, # without column names ...
'ds_id': datasource_id, schema['columns'] = []
'error': str(e)
}
msg = _('Unable to get schema for table "%(table_name)s", '
'data source "%(ds_id)s": %(error)s') % msg_args
messages.error(self.request, msg)
redirect = reverse('horizon:admin:datasources:index')
raise exceptions.Http302(redirect)
columns = schema['columns']
row_len = 0 row_len = 0
if len(rows): if len(rows):
row_len = len(rows[0].get('data', [])) row_len = len(rows[0].get('data', []))
columns = schema['columns']
if not row_len or row_len == len(columns): if not row_len or row_len == len(columns):
for col in columns: for col in columns:
col_name = col['name'] col_name = col['name']
@ -246,7 +240,6 @@ class DetailView(tables.DataTableView):
messages.error(self.request, msg) messages.error(self.request, msg)
redirect = reverse('horizon:admin:datasources:index') redirect = reverse('horizon:admin:datasources:index')
raise exceptions.Http302(redirect) raise exceptions.Http302(redirect)
return rows return rows
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):