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

Fixed an issue where user details are not shown when the non-admin user tries

Browse Source 
to connect to the shared server. Fixes #6940
This commit is contained in:
Pradip Parkale
2021-10-29 16:26:11 +05:30
committed by Akshay Joshi
parent f71e2e8040
commit fa8b3edda5
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/browser/server_groups/servers/static/js/server.js
View File

@@ -813,14 +813,12 @@ define('pgadmin.node.server', [
var connect_to_server = function(obj, data, tree, item, reconnect) {
// Open properties dialog in edit mode
const selectedTreeNode = tree.selected().length > 0 ? tree.selected() : tree.first();
const selectedTreeNodeData = selectedTreeNode && selectedTreeNode.length === 1 ? tree.itemData(selectedTreeNode) : undefined;
var server_url = obj.generate_url(item, 'obj', data, true);
// Fetch the updated data
$.get(server_url)
.done(function(res) {
if (res.shared && _.isNull(res.username) && data.user_id != current_user.id){
if (selectedTreeNodeData._type == 'server' && !res.service){
if (!res.service){
pgAdmin.Browser.Node.callbacks.show_obj_properties.call(
pgAdmin.Browser.Nodes[tree.itemData(item)._type], {action: 'edit'}
);

2
web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
View File

@@ -143,7 +143,7 @@ export default class ServerSchema extends BaseUISchema {
mode: ['properties', 'create', 'edit'],
readonly: function(state){
var serverOwner = obj.userId;
if (obj.isNew(state) && serverOwner != current_user.id) {
if (!obj.isNew(state) && serverOwner != current_user.id) {
return true;
}
return false;