From e2b27da2efcbec242a31c2a39d895facec45f38f Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Thu, 18 May 2023 16:21:15 +0530 Subject: [PATCH] Fixed an issue where properties not visible for FTS Parsers, FTS Templates, MViews and Rules in Catalog objects. #6127 --- docs/en_US/release_notes_7_2.rst | 1 + .../databases/schemas/fts_parsers/static/js/fts_parser.js | 2 +- .../databases/schemas/fts_templates/static/js/fts_template.js | 2 +- .../servers/databases/schemas/packages/static/js/package.js | 4 ++-- .../databases/schemas/tables/rules/static/js/rule.ui.js | 2 +- .../servers/databases/schemas/views/static/js/mview.js | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/en_US/release_notes_7_2.rst b/docs/en_US/release_notes_7_2.rst index 2975f08b8..f217d73f5 100644 --- a/docs/en_US/release_notes_7_2.rst +++ b/docs/en_US/release_notes_7_2.rst @@ -34,6 +34,7 @@ Bug fixes | `Issue #6003 `_ - Indicate the user if all the server's children nodes are hidden from the preferences setting. | `Issue #6026 `_ - Tools menu should be toggled for "pause replay of wal" and "resume replay of wal". | `Issue #6080 `_ - pgAdmin icon not showing on taskbar on Windows 10. + | `Issue #6127 `_ - Fixed an issue where properties were not visible for FTS Parsers, FTS Templates, MViews, and Rules in Catalog objects. | `Issue #6147 `_ - Heartbeat is getting logged, though no server is connected in pgAdmin. | `Issue #6204 `_ - Ensure that name can't be empty in edit mode for Primary Key and Index. | `Issue #6221 `_ - Fix circular reference error for the multirange data types in the query tool. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js index f115c304e..0d11a08c5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js @@ -91,7 +91,7 @@ define('pgadmin.node.fts_parser', [ }) }, { - schema: treeNodeInfo.schema._id, + schema: itemNodeData._id, } ); } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js index a4747d583..8e560e3ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js @@ -80,7 +80,7 @@ define('pgadmin.node.fts_template', [ schemaList:()=>getNodeListById(pgBrowser.Nodes['schema'], treeNodeInfo, itemNodeData), }, { - schema: treeNodeInfo.schema._id, + schema: itemNodeData._id, } ); } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js index 4c8c6c483..2c3838d22 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js @@ -52,7 +52,7 @@ define('pgadmin.node.package', [ name: 'create_package_on_coll', node: 'coll-package', module: this, applies: ['object', 'context'], callback: 'show_obj_properties', category: 'create', priority: 4, label: gettext('Package...'), - data: {action: 'create', check: true, + data: {action: 'create', check: true, data_disabled: gettext('This option is only available on EPAS servers.')}, enable: 'canCreate', },{ @@ -97,7 +97,7 @@ define('pgadmin.node.package', [ }), node_info: treeNodeInfo }, { - schema: treeNodeInfo.schema.label + schema: ('schema' in treeNodeInfo)? treeNodeInfo.schema.label : '' } ); } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.ui.js index c270ac0d1..9fd24601a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.ui.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.ui.js @@ -53,7 +53,7 @@ export default class RuleSchema extends BaseUISchema { id: 'schema', label:'', type: 'text', visible: false, disabled: (state) => { // It is used while generating sql - state.schema = obj.fieldOptions.nodeInfo.schema.label; + state.schema = ('schema' in obj.fieldOptions.nodeInfo) ? obj.fieldOptions.nodeInfo.schema.label : ''; }, }, { diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js index 7653ee7ac..75b1e0054 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js @@ -144,7 +144,7 @@ define('pgadmin.node.mview', [ }, { owner: pgBrowser.serverInfo[treeNodeInfo.server._id].user.name, - schema: treeNodeInfo.schema.label + schema: ('schema' in treeNodeInfo)? treeNodeInfo.schema.label : '' } ); },