Ensure that inherit table icon should be visible properly in the tree view. Fixes #6845

This commit is contained in:
Pradip Parkale 2021-11-11 12:55:38 +05:30 committed by Akshay Joshi
parent 7468ca36ae
commit d4bf7164f9
2 changed files with 4 additions and 3 deletions

View File

@ -23,6 +23,7 @@ Bug fixes
| `Issue #6780 <https://redmine.postgresql.org/issues/6780>`_ - Ensure that columns should be merged if the newly added column is present in the parent table.
| `Issue #6809 <https://redmine.postgresql.org/issues/6809>`_ - Fixed an issue where pgAdmin is not opening properly.
| `Issue #6832 <https://redmine.postgresql.org/issues/6832>`_ - Ensure that internal authentication when combined with other authentication providers, the order of internal source should not matter while picking up the provider.
| `Issue #6845 <https://redmine.postgresql.org/issues/6845>`_ - Ensure that inherit table icon should be visible properly in the tree view.
| `Issue #6859 <https://redmine.postgresql.org/issues/6859>`_ - Fixed an issue where properties panel is not updated when any object is added from the browser tree.
| `Issue #6905 <https://redmine.postgresql.org/issues/6905>`_ - Fixed an issue where database nodes are not getting loaded behind a reverse proxy with SSL.
| `Issue #6925 <https://redmine.postgresql.org/issues/6925>`_ - Fixed SQL syntax error if select "Custom auto-vacuum" option and not set Autovacuum option to Yes or No.

View File

@ -319,19 +319,19 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare):
def get_icon_css_class(self, table_info, default_val='icon-table'):
if ('is_inherits' in table_info and
table_info['is_inherits'] == '1') or \
table_info['is_inherits'] > '0') or \
('coll_inherits' in table_info and
len(table_info['coll_inherits']) > 0):
if ('is_inherited' in table_info and
table_info['is_inherited'] == '1')\
table_info['is_inherited'] > '0')\
or ('relhassubclass' in table_info and
table_info['relhassubclass']):
default_val = 'icon-table-multi-inherit'
else:
default_val = 'icon-table-inherits'
elif ('is_inherited' in table_info and
table_info['is_inherited'] == '1')\
table_info['is_inherited'] > '0')\
or ('relhassubclass' in table_info and
table_info['relhassubclass']):
default_val = 'icon-table-inherited'