openstack
/
horizon
Code Issues Proposed changes

Merge "Do not instantiate tables when a tab is not allowed"

This commit is contained in:
Zuul 2019-01-11 16:24:27 +00:00 committed by Gerrit Code Review
parent 2ee90cdc9e 26b838b7eb
commit a6f54f2708
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
horizon/tabs/base.py
View File

@ -484,9 +484,14 @@ class TableTab(Tab):
raise NotImplementedError("You must define a table_class "
"attribute on %s" % class_name)
# Instantiate our table classes but don't assign data yet
table_instances = [(table._meta.name,
table(request, **tab_group.kwargs))
for table in self.table_classes]
if self._allowed:
table_instances = [(table._meta.name,
table(request, **tab_group.kwargs))
for table in self.table_classes]
else:
# When a corresponding tab is not allowed, there is no need to
# instantiate table classes (Related to bug 1791296).
table_instances = []
self._tables = OrderedDict(table_instances)
self._table_data_loaded = False