Fix an issue where pgAdmin4 unable to retrieve table node if the trigger is already disabled and the user clicks on Enable All. Fixes #4953.

This commit is contained in:
Khushboo Vashi 2019-12-02 15:26:36 +05:30 committed by Akshay Joshi
parent d95e8db4ee
commit ae2aadeede
3 changed files with 4 additions and 2 deletions

View File

@ -38,6 +38,7 @@ Bug fixes
| `Issue #4934 <https://redmine.postgresql.org/issues/4934>`_ - Fix the help button link on the User Management dialog.
| `Issue #4935 <https://redmine.postgresql.org/issues/4935>`_ - Fix accessibility issues.
| `Issue #4952 <https://redmine.postgresql.org/issues/4952>`_ - Fix an issue of retrieving properties for Compound Triggers. It's a regression of #4006.
| `Issue #4953 <https://redmine.postgresql.org/issues/4953>`_ - Fix an issue where pgAdmin4 unable to retrieve table node if the trigger is already disabled and the user clicks on Enable All.
| `Issue #4964 <https://redmine.postgresql.org/issues/4964>`_ - Fix an issue where length and precision are not removed from table/column dialog.
| `Issue #4965 <https://redmine.postgresql.org/issues/4965>`_ - Fix an issue where the Interval data type is not displayed in the properties dialog of table/column.
| `Issue #4978 <https://redmine.postgresql.org/issues/4978>`_ - Fix pgAdmin4 failed to start issue after upgrading to version 4.15.

View File

@ -43,6 +43,7 @@ export function getTreeNodeHierarchyFromElement(pgBrowser, treeNode) {
export function getTreeNodeHierarchyFromIdentifier(aciTreeNodeIdentifier) {
let identifier = this.treeMenu.translateTreeNodeIdFromACITree(aciTreeNodeIdentifier);
let currentNode = this.treeMenu.findNode(identifier);
if (currentNode === null) return null;
return getTreeNodeHierarchy.call(this, currentNode);
}

View File

@ -211,7 +211,7 @@ _.extend(pgBrowser.browserTreeState, {
node = data && pgBrowser.Nodes[data._type],
treeHierarchy = node && node.getTreeNodeHierarchy(item);
if (!pgBrowser.tree.hasParent(item) || !(self.parent in treeHierarchy))
if (treeHierarchy === null || !pgBrowser.tree.hasParent(item) || !(self.parent in treeHierarchy))
return;
let topParent = treeHierarchy && treeHierarchy[self.parent]['_id'],
@ -269,7 +269,7 @@ _.extend(pgBrowser.browserTreeState, {
treeHierarchy = node && node.getTreeNodeHierarchy(item);
if (!pgBrowser.tree.hasParent(item) || !(self.parent in treeHierarchy))
if (treeHierarchy === null || !pgBrowser.tree.hasParent(item) || !(self.parent in treeHierarchy))
return;
// If the server node is open then only we should populate the tree