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

Adding the node at correct place in the browser tree after creating new object.

Browse Source
This commit is contained in:
Ashesh Vashi 2016-01-05 13:02:00 +05:30
parent 7beaefd1c6
commit aec96b4933
1 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
web/pgadmin/browser/templates/browser/js/node.js
View File

@ -796,9 +796,10 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
setTimeout(function() {
closePanel();
}, 0);
tree.setVisible(i);
tree.select(i);
};
if (i) {
tree.select(i, {focus: true});
}
}, found = false;
delete view.model.tnode;
@ -816,13 +817,13 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
func(o.items.eq(0));
}
});
return;
} else {
var children = tree.children(item, false, false);
if (children) {
var check = true;
_.each(children, function(child) {
if (!check)
if (found)
return;
var j = $(child);
data = tree.itemData(j);
@ -831,7 +832,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
node = pgBrowser.Nodes[data._type];
if (node && node.node && node.node == that.type) {
check = false;
found = true;
if (tree.wasLoad(j)) {
tree.append(j, {
itemData: d,
@ -839,12 +840,50 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
func(o.items.eq(0));
}
});
} else {
/*
* This is not yet loaded, hence - we need to expand
* it, and find the actual object.
*/
if (!tree.isInode(j)) {
tree.setInode(j);
}
tree.open(j, {
success: function() {
var children = tree.children(j, false, false),
stop = false;
_.each(children, function(child) {
if (stop)
return;
var j = $(child),
data = tree.itemData(j);
if (d._id == data._id) {
stop = true;
func(j);
}
});
func(null);
},
fail: function() {
console.log(arguments);
}
});
}
}
}
});
}
}
/*
* We already added the node at required place, stop going
* ahead.
*/
if (found)
return;
/* When no children found, it was loaded.
* It sets the item to non-inode.
@ -853,7 +892,6 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
tree.setInode(item);
}
tree.open(item, {
expand: true,
success: function() {
var s = tree.search(item, {
search: d.id,