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

Treat databases with datallowconn=false appropriately. Fixes #1801

Browse Source
This commit is contained in:
Khushboo Vashi
2016-12-09 11:59:13 +00:00
committed by Dave Page
parent 6ff2fe64b8
commit 81841cdb3c
25 changed files with 308 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web/pgadmin/tools/restore/templates/restore/js/restore.js
View File

@@ -240,11 +240,19 @@ define([
var t = pgBrowser.tree, i = item, d = itemData;
var parent_item = t.hasParent(i) ? t.parent(i): null,
parent_data = parent_item ? t.itemData(parent_item) : null;
if(!_.isUndefined(d) && !_.isNull(d) && !_.isNull(parent_data))
return (
(_.indexOf(restore_supported_nodes, d._type) !== -1 &&
is_parent_catalog(itemData, item, data) ) ? true: false
);
if(!_.isUndefined(d) && !_.isNull(d) && !_.isNull(parent_data)) {
if (_.indexOf(restore_supported_nodes, d._type) !== -1 &&
is_parent_catalog(itemData, item, data) ) {
if (d._type == 'database' && d.allowConn)
return true;
else if(d._type != 'database')
return true;
else
return false;
}
else
return false;
}
else
return false;
};