diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js index a8a4f7b20..4b132c182 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js @@ -437,13 +437,12 @@ define('pgadmin.node.function', [ if(this.node_info && 'catalog' in this.node_info) { return true; } - switch(this.name){ - case 'prosupportfunc': + if(this.name === 'prosupportfunc'){ var item = pgAdmin.Browser.tree.selected(); if(pgAdmin.Browser.Nodes['function'].getTreeNodeHierarchy(item).server.user.is_superuser) return false; return true; - default: + } else { return false; } }, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js index a47d9b3ce..2cdb60e98 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js @@ -98,12 +98,7 @@ define('pgadmin.node.procedure', [ ), canVarAdd: function() { var server = this.node_info.server; - if (server.version < 90500) { - return false; - } - else { - return true; - } + return !(server.version < 90500); }, isVisible: function() { if (this.name == 'sysfunc') { return false; } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js index edd48fbd1..a3d24adf4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js @@ -358,13 +358,12 @@ define('pgadmin.node.trigger_function', [ if(this.node_info && 'catalog' in this.node_info) { return true; } - switch(this.name){ - case 'prorows': + if (this.name === 'prorows'){ if(m.get('proretset') == true) { return false; } return true; - default: + } else { return false; } }, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js index cef365d7d..a987a46bd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js @@ -661,11 +661,7 @@ define('pgadmin.node.column', [ type: 'text', mode: ['properties'], deps: ['is_inherited'], group: gettext('Definition'), visible: function(m) { - if (!_.isUndefined(m.get('is_inherited')) && m.get('is_inherited')) { - return true; - } else { - return false; - } + return (!_.isUndefined(m.get('is_inherited')) && m.get('is_inherited')); }, },{ id: 'is_sys_column', label: gettext('System column?'), cell: 'string', @@ -871,11 +867,7 @@ define('pgadmin.node.column', [ if(this.node_info && 'schema' in this.node_info) { // We will disable control if it's in 'edit' mode - if (m.isNew()) { - return false; - } else { - return true; - } + return !(m.isNew()); } return true; }, @@ -903,11 +895,7 @@ define('pgadmin.node.column', [ return false; } // if we are in edit mode - if (!_.isUndefined(m.get('attnum')) && m.get('attnum') > 0 ) { - return false; - } else { - return true; - } + return !(!_.isUndefined(m.get('attnum')) && m.get('attnum') > 0 ); } return true; }, @@ -947,15 +935,11 @@ define('pgadmin.node.column', [ d = i ? t.itemData(i) : null; } // If node is under catalog then do not allow 'create' menu - if (_.indexOf(parents, 'catalog') > -1 || - _.indexOf(parents, 'coll-view') > -1 || - _.indexOf(parents, 'coll-mview') > -1 || - _.indexOf(parents, 'mview') > -1 || - _.indexOf(parents, 'view') > -1) { - return false; - } else { - return true; - } + return !(_.indexOf(parents, 'catalog') > -1 || + _.indexOf(parents, 'coll-view') > -1 || + _.indexOf(parents, 'coll-mview') > -1 || + _.indexOf(parents, 'mview') > -1 || + _.indexOf(parents, 'view') > -1); }, }); } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js index 3cb8d7969..49d845d34 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js @@ -397,11 +397,7 @@ define('pgadmin.node.compound_trigger', [ return false; } else { // if we are in edit mode - if (!_.isUndefined(m.get('attnum')) && m.get('attnum') >= 1 ) { - return false; - } else { - return true; - } + return !(!_.isUndefined(m.get('attnum')) && m.get('attnum') >= 1 ); } } return true; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js index cb79d8e6f..d7a65ff83 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js @@ -210,11 +210,7 @@ define('pgadmin.node.check_constraint', [ d = i ? t.itemData(i) : null; } // If node is under catalog then do not allow 'create' menu - if (_.indexOf(parents, 'catalog') > -1) { - return false; - } else { - return true; - } + return !(_.indexOf(parents, 'catalog') > -1); }, }); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js index 37594608d..c07e7245c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js @@ -698,8 +698,7 @@ define('pgadmin.node.exclusion_constraint', [ select2:{allowClear:false}, filter: function(m) { // Don't show pg_global tablespace in selection. - if (m.label == 'pg_global') return false; - else return true; + return !(m.label == 'pg_global'); }, },{ id: 'amname', label: gettext('Access method'), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js index dff4aacbd..7f5144c9d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js @@ -417,11 +417,7 @@ define('pgadmin.node.primary_key', [ disabled: function(m) { // Disable if index is selected. var index = m.get('index'); - if(_.isUndefined(index) || index == '') { - return false; - } else { - return true; - } + return !(_.isUndefined(index) || index == ''); }, },{ id: 'include', label: gettext('Include columns'),