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

Add missing collection node child counts. Fixes #1250

Browse Source
This commit is contained in:
Akshay Joshi 2016-08-09 12:12:05 +01:00 committed by Dave Page
parent 33457e6a90
commit 9dfc7bff35
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/pgadmin/browser/templates/browser/js/collection.js
View File

@ -50,6 +50,7 @@ function($, _, S, pgAdmin, Backbone, Alertify, Backform) {
}
},
hasId: false,
is_collection: true,
// A collection will always have a collection of statistics, when the node
// it represent will have some statistics.
hasCollectiveStatistics: true,

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

@ -633,6 +633,27 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {
this, [undefined, i]
);
},
added: function(item, data, browser) {
var b = browser || pgBrowser,
t = b.tree,
pItem = t.parent(item),
pData = pItem && t.itemData(pItem),
pNode = pData && pgBrowser.Nodes[pData._type];
// Check node is a collection or not.
if (pNode && pNode.is_collection) {
/* If 'collection_count' is not present in data
* it means tree node expanded first time, so we will
* kept collection count and label in data itself.
*/
if (!('collection_count' in pData)) {
pData.collection_count = 0;
pData._label = pData.label;
}
pData.collection_count++;
t.setLabel(pItem, {label: (pData._label + ' <span>(' + pData.collection_count + ')</span>')});
}
},
// Callback called - when a node is selected in browser tree.
selected: function(item, data, browser) {
// Show the information about the selected node in the below panels,
@ -691,9 +712,34 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {
return true;
},
removed: function(item) {
var self = this;
var self = this,
t = pgBrowser.tree,
pItem = t.parent(item),
pData = pItem && t.itemData(pItem),
pNode = pData && pgBrowser.Nodes[pData._type];
// Check node is a collection or not.
if (pNode && pNode.is_collection &&
'collection_count' in pData)
{
pData.collection_count--;
t.setLabel(pItem, {label: (pData._label + ' <span>(' + pData.collection_count + ')</span>')});
}
setTimeout(function() { self.clear_cache.apply(self, item); }, 0);
},
unloaded: function(item) {
var self = this,
t = pgBrowser.tree,
data = item && t.itemData(item);
// In case of unload remove the collection counter
if (self.is_collection && 'collection_count' in data)
{
delete data.collection_count;
t.setLabel(item, {label: data._label});
}
},
refresh: function(n, i) {
var self = this,
t = pgBrowser.tree,