IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

More code cleanup for SonarQube.

Browse Source
This commit is contained in:
Akshay Joshi
2020-06-18 16:20:34 +01:00
committed by Dave Page
parent 6d3f13076f
commit bc24e3643f
13 changed files with 73 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/pgadmin/tools/backup/static/js/backup.js
View File

@@ -200,7 +200,7 @@ define([
var t = pgBrowser.tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined;
return d.version >= 110000;
return _.isUndefined(d) ? false : d.version >= 110000;
}
return true;
},
@@ -392,9 +392,9 @@ define([
var t = pgBrowser.tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined,
s = pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
s = _.isUndefined(d) ? undefined : pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
return s.version >= 110000;
return _.isUndefined(s) ? false : s.version >= 110000;
},
}],
}, {
@@ -467,9 +467,9 @@ define([
var t = pgBrowser.tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined,
s = pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
s = _.isUndefined(d) ? undefined : pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
return s.version >= 110000;
return _.isUndefined(s) ? false : s.version >= 110000;
},
}],
}, {
@@ -519,9 +519,9 @@ define([
var t = pgBrowser.tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined,
s = pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
s = _.isUndefined(d) ? undefined : pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
if (s.version >= 120000)
if (!_.isUndefined(s) && s.version >= 120000)
return true;
if (m.get('use_column_inserts') || m.get('use_insert_commands')) {

2
web/pgadmin/tools/datagrid/static/js/show_data.js
View File

@@ -46,7 +46,7 @@ export function showDataGrid(
const gridUrl = generateUrl(transId, connectionData, node.getData(), parentData);
const queryToolTitle = generateDatagridTitle(pgBrowser, aciTreeIdentifier);
if(filter) {
initFilterDialog(alertify, pgBrowser, preferences);
initFilterDialog(alertify, pgBrowser);
const validateUrl = generateFilterValidateUrl(node.getData(), parentData);

5
web/pgadmin/tools/debugger/static/js/debugger.js
View File

@@ -463,12 +463,13 @@ define([
i = item || t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined,
node = d && pgBrowser.Nodes[d._type],
self = this,
is_edb_proc = d._type == 'edbproc';
self = this;
if (!d)
return;
var is_edb_proc = d._type == 'edbproc';
var treeInfo = node.getTreeNodeHierarchy.apply(node, [i]),
_url = this.generate_url('init', treeInfo, node);

2
web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
View File

@@ -442,6 +442,8 @@ define([
d = this.d = i && i.length == 1 ? t.itemData(i) : undefined,
info = this.info = pgBrowser.Node.getTreeNodeHierarchy(i);
if(_.isUndefined(d))
return;
/**
Generate a URL using:
gid, did, sid(server id), node_id(node id),

4
web/pgadmin/tools/restore/static/js/restore.js
View File

@@ -272,9 +272,9 @@ define('tools.restore', [
var t = pgBrowser.tree,
i = t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined,
s = pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
s = _.isUndefined(d) ? undefined : pgBrowser.Nodes[d._type].getTreeNodeHierarchy(i)['server'];
return s.version >= 110000;
return _.isUndefined(s) ? false : s.version >= 110000;
},
}],
}, {