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

Fix 'expressions evaluated to true/false always' issue reported by SonarQube.

Browse Source
This commit is contained in:
Satish V 2020-06-15 16:28:59 +05:30 committed by Akshay Joshi
parent 38cd3327f3
commit eb1b17b636
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js
View File

@ -118,12 +118,13 @@ define('pgadmin.node.domain_constraints', [
if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') {
err['name'] = gettext('Name cannot be empty.'); err['name'] = gettext('Name cannot be empty.');
errmsg = errmsg || err['name']; errmsg = err['name'];
} }
if (_.isUndefined(this.get('consrc')) || String(this.get('consrc')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('consrc')) || String(this.get('consrc')).replace(/^\s+|\s+$/g, '') == '') {
err['consrc'] = gettext('Check cannot be empty.'); err['consrc'] = gettext('Check cannot be empty.');
errmsg = errmsg || err['consrc']; errmsg = errmsg || err['consrc'];
} }
this.errorModel.clear().set(err); this.errorModel.clear().set(err);

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js
View File

@ -296,7 +296,7 @@ define('pgadmin.node.domain', [
if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') {
err['name'] = gettext('Name cannot be empty.'); err['name'] = gettext('Name cannot be empty.');
errmsg = errmsg || err['name']; errmsg = err['name'];
} }
if (_.isUndefined(this.get('basetype')) || String(this.get('basetype')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('basetype')) || String(this.get('basetype')).replace(/^\s+|\s+$/g, '') == '') {

75
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js
View File

@ -341,48 +341,47 @@ define('pgadmin.node.foreign_table', [
url = 'get_columns', url = 'get_columns',
m = self.model.top || self.model; m = self.model.top || self.model;
if (url) { var node = this.field.get('schema_node'),
var node = this.field.get('schema_node'), node_info = this.field.get('node_info'),
node_info = this.field.get('node_info'), full_url = node.generate_url.apply(
full_url = node.generate_url.apply( node, [
node, [ null, url, this.field.get('node_data'),
null, url, this.field.get('node_data'), this.field.get('url_with_id') || false, node_info,
this.field.get('url_with_id') || false, node_info, ]),
]), cache_level = this.field.get('cache_level') || node.type,
cache_level = this.field.get('cache_level') || node.type, cache_node = this.field.get('cache_node');
cache_node = this.field.get('cache_node');
cache_node = (cache_node && pgBrowser.Nodes['cache_node']) || node; cache_node = (cache_node && pgBrowser.Nodes['cache_node']) || node;
m.trigger('pgadmin:view:fetching', m, self.field); m.trigger('pgadmin:view:fetching', m, self.field);
var data = {attrelid: table_id}; var data = {attrelid: table_id};
// Fetching Columns data for the selected table.
$.ajax({
async: false,
url: full_url,
data: data,
})
.done(function(res) {
/*
* We will cache this data for short period of time for avoiding
* same calls.
*/
data = cache_node.cache(url, node_info, cache_level, res.data);
// Fetching Columns data for the selected table.
$.ajax({
async: false,
url: full_url,
data: data,
}) })
.done(function(res) { .fail(function() {
/* m.trigger('pgadmin:view:fetch:error', m, self.field);
* We will cache this data for short period of time for avoiding });
* same calls. m.trigger('pgadmin:view:fetched', m, self.field);
*/
data = cache_node.cache(url, node_info, cache_level, res.data);
}) // To fetch only options from cache, we do not need time from 'at'
.fail(function() { // attribute but only options.
m.trigger('pgadmin:view:fetch:error', m, self.field); //
}); // It is feasible that the data may not have been fetched.
m.trigger('pgadmin:view:fetched', m, self.field); data = (data && data.data) || [];
return data;
// To fetch only options from cache, we do not need time from 'at'
// attribute but only options.
//
// It is feasible that the data may not have been fetched.
data = (data && data.data) || [];
return data;
}
}, },
}); });
@ -440,7 +439,7 @@ define('pgadmin.node.foreign_table', [
if (_.isUndefined(this.get('conname')) || String(this.get('conname')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('conname')) || String(this.get('conname')).replace(/^\s+|\s+$/g, '') == '') {
err['conname'] = gettext('Constraint Name cannot be empty.'); err['conname'] = gettext('Constraint Name cannot be empty.');
errmsg = errmsg || err['conname']; errmsg = err['conname'];
} }
if (_.isUndefined(this.get('consrc')) || String(this.get('consrc')) if (_.isUndefined(this.get('consrc')) || String(this.get('consrc'))
@ -657,7 +656,7 @@ define('pgadmin.node.foreign_table', [
if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') {
err['name'] = gettext('Name cannot be empty.'); err['name'] = gettext('Name cannot be empty.');
errmsg = errmsg || err['name']; errmsg = err['name'];
} }
if (_.isUndefined(this.get('basensp')) || String(this.get('basensp')) if (_.isUndefined(this.get('basensp')) || String(this.get('basensp'))

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js
View File

@ -367,7 +367,7 @@ define('pgadmin.node.function', [
if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') {
err['name'] = gettext('Name cannot be empty.'); err['name'] = gettext('Name cannot be empty.');
errmsg = errmsg || err['name']; errmsg = err['name'];
} }
if (_.isUndefined(this.get('funcowner')) || String(this.get('funcowner')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('funcowner')) || String(this.get('funcowner')).replace(/^\s+|\s+$/g, '') == '') {

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js
View File

@ -166,7 +166,7 @@ define('pgadmin.node.procedure', [
if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') {
err['name'] = gettext('Name cannot be empty.'); err['name'] = gettext('Name cannot be empty.');
errmsg = errmsg || err['name']; errmsg = err['name'];
} }
if (_.isUndefined(this.get('pronamespace')) || String(this.get('pronamespace')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('pronamespace')) || String(this.get('pronamespace')).replace(/^\s+|\s+$/g, '') == '') {

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js
View File

@ -276,7 +276,7 @@ define('pgadmin.node.trigger_function', [
if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('name')) || String(this.get('name')).replace(/^\s+|\s+$/g, '') == '') {
err['name'] = gettext('Name cannot be empty.'); err['name'] = gettext('Name cannot be empty.');
errmsg = errmsg || err['name']; errmsg = err['name'];
} }
if (_.isUndefined(this.get('funcowner')) || String(this.get('funcowner')).replace(/^\s+|\s+$/g, '') == '') { if (_.isUndefined(this.get('funcowner')) || String(this.get('funcowner')).replace(/^\s+|\s+$/g, '') == '') {