From 1ce1f216caaec414def266cc69d90961b8c0a131 Mon Sep 17 00:00:00 2001 From: Murtuza Zabuawala Date: Tue, 25 Apr 2017 12:39:46 +0530 Subject: [PATCH] Fixed handling of nested privileges. Fixes #2335 --- .../server_groups/servers/static/js/privilege.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web/pgadmin/browser/server_groups/servers/static/js/privilege.js b/web/pgadmin/browser/server_groups/servers/static/js/privilege.js index e3da8453f..6b7efb63f 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/privilege.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/privilege.js @@ -140,7 +140,15 @@ selected = {}, model = cell.model, cid = model.cid, - curr_user = model.top.node_info.server.user.name; + // We need to check node_info values in parent when object is nested. + // eg: column level privileges in table dialog + // In this case node_info will not be avilable to column node as + // it is not loaded yet + node_info = (_.has(model.top, 'node_info') + && !_.isUndefined(model.top.node_info)) ? + model.top.node_info : + model.handler.top.node_info, + curr_user = node_info.server.user.name; var idx = 0;