From 873deaa92dc66240d64fc9e9474d9185ce1d776d Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Wed, 7 Jul 2021 14:08:47 +0530 Subject: [PATCH] Changed getNodeListByName to add params obj in parameters. --- .../server_groups/servers/databases/static/js/database.js | 2 +- .../server_groups/servers/static/js/privilege.ui.js | 7 ++----- .../server_groups/servers/static/js/sec_label.ui.js | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js index 2ede8811b..af1143aeb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js +++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js @@ -337,7 +337,7 @@ define('pgadmin.node.database', [ return res; }), spcname: - ()=>getNodeListByName('tablespace', treeNodeInfo, itemNodeData, (m)=>{ + ()=>getNodeListByName('tablespace', treeNodeInfo, itemNodeData, {}, (m)=>{ return (m.label != 'pg_global'); }), datcollate: diff --git a/web/pgadmin/browser/server_groups/servers/static/js/privilege.ui.js b/web/pgadmin/browser/server_groups/servers/static/js/privilege.ui.js index 9daaf778b..5cfd49502 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/privilege.ui.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/privilege.ui.js @@ -12,21 +12,19 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui'; import { getNodeListByName } from '../../../../static/js/node_ajax'; export function getNodePrivilegeRoleSchema(nodeObj, treeNodeInfo, itemNodeData, privileges) { - let keys = ['grantee', 'privileges', 'grantor']; return new PrivilegeRoleSchema( - ()=>getNodeListByName('role', treeNodeInfo, itemNodeData, ()=>true, (res)=>{ + ()=>getNodeListByName('role', treeNodeInfo, itemNodeData, {}, ()=>true, (res)=>{ res.unshift({label: 'PUBLIC', value: 'PUBLIC'}); return res; }), ()=>getNodeListByName('role', treeNodeInfo, itemNodeData), - keys, treeNodeInfo, privileges ); } export default class PrivilegeRoleSchema extends BaseUISchema { - constructor(granteeOptions, grantorOptions, keys, nodeInfo, supportedPrivs) { + constructor(granteeOptions, grantorOptions, nodeInfo, supportedPrivs) { super({ grantee: undefined, grantor: nodeInfo?.server?.user?.name, @@ -36,7 +34,6 @@ export default class PrivilegeRoleSchema extends BaseUISchema { this.grantorOptions = grantorOptions; this.nodeInfo = nodeInfo; this.supportedPrivs = supportedPrivs || []; - this.keys = keys; } get baseFields() { diff --git a/web/pgadmin/browser/server_groups/servers/static/js/sec_label.ui.js b/web/pgadmin/browser/server_groups/servers/static/js/sec_label.ui.js index 9fb1cdaf0..9a18d6824 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/sec_label.ui.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/sec_label.ui.js @@ -16,7 +16,6 @@ export default class SecLabelSchema extends BaseUISchema { provider: undefined, label: undefined, }); - this.keys = ['provider', 'label']; } get baseFields() {