1) Added special handling for the extension to resolve the dependency.

2) Added 'is_sys_obj' to the ignore list of Schema Diff.
3) Font awesome v5 fixes.
This commit is contained in:
Akshay Joshi
2020-08-13 17:48:04 +05:30
parent 63df19ee1c
commit 8f61944386
11 changed files with 26 additions and 12 deletions

View File

@@ -45,7 +45,7 @@ export function setQueryToolDockerTitle(panel, is_query_tool, panel_title, is_fi
else if (is_query_tool == 'false' || is_query_tool == false) {
// Edit grid titles
panel_tooltip = gettext('View/Edit Data - ') + panel_title;
panel_icon = 'fa fa-table';
panel_icon = 'pg-font-icon icon-view-data';
} else {
// Query tool titles
panel_tooltip = gettext('Query Tool - ') + panel_title;

View File

@@ -19,7 +19,7 @@ from pgadmin.tools.schema_diff.directory_compare import compare_dictionaries
class SchemaDiffObjectCompare:
keys_to_ignore = ['oid', 'oid-2']
keys_to_ignore = ['oid', 'oid-2', 'is_sys_obj']
@staticmethod
def get_schema(sid, did, scid):

View File

@@ -135,6 +135,11 @@ function selectDependencies(data, isChecked) {
}
setDependencies = function(rowData, dependencies, isChecked) {
// Special handling for extension, if extension is present in the
// dependency list then iterate and select only extension node.
let extensions = dependencies.filter(item => item.type == 'extension');
if (extensions.length > 0) dependencies = extensions;
_.each(dependencies, function(dependency) {
if (dependency.length == 0) return;
let dependencyData = [];