pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue where the server icon getting change to the shared server icon in desktop mode. 

refs #4979
pull/35/head
Pradip Parkale 2020-09-08 10:09:16 +05:30 committed by Akshay Joshi
parent 9e5487d5ad
commit 98e86a8160
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,7 @@ define('pgadmin.node.server', [
d = t.itemData(i); d = t.itemData(i);
t.removeIcon(i); t.removeIcon(i);
d.connected = false; d.connected = false;
if (d.shared){ if (d.shared && pgAdmin.server_mode == 'True'){
d.icon = 'icon-shared-server-not-connected'; d.icon = 'icon-shared-server-not-connected';
}else{ }else{
d.icon = 'icon-server-not-connected'; d.icon = 'icon-server-not-connected';
@ -1216,6 +1216,7 @@ define('pgadmin.node.server', [
tree.unload(item); tree.unload(item);
tree.setInode(item); tree.setInode(item);
tree.addIcon(item, {icon: 'icon-shared-server-not-connected'}); tree.addIcon(item, {icon: 'icon-shared-server-not-connected'});
Alertify.info('Please enter the server details to connect to the server. This server is a shared server.');
}else{ }else{
data.is_connecting = false; data.is_connecting = false;
tree.unload(item); tree.unload(item);
@ -1238,7 +1239,7 @@ define('pgadmin.node.server', [
// Let's not change the status of the tree node now. // Let's not change the status of the tree node now.
if (!_wasConnected) { if (!_wasConnected) {
tree.setInode(_item); tree.setInode(_item);
if (data.shared){ if (data.shared && pgAdmin.server_mode == 'True'){
tree.addIcon(_item, {icon: 'icon-shared-server-not-connected'}); tree.addIcon(_item, {icon: 'icon-shared-server-not-connected'});
}else{ }else{
tree.addIcon(_item, {icon: 'icon-server-not-connected'}); tree.addIcon(_item, {icon: 'icon-server-not-connected'});
@ -1400,7 +1401,7 @@ define('pgadmin.node.server', [
_tree.unload(_item); _tree.unload(_item);
_tree.setInode(_item); _tree.setInode(_item);
_tree.removeIcon(_item); _tree.removeIcon(_item);
if (_data.shared){ if (_data.shared && pgAdmin.server_mode == 'True'){
_tree.addIcon(_item, {icon: 'icon-shared-server-not-connected'}); _tree.addIcon(_item, {icon: 'icon-shared-server-not-connected'});
}else{ }else{
_tree.addIcon(_item, {icon: 'icon-server-not-connected'}); _tree.addIcon(_item, {icon: 'icon-server-not-connected'});
@ -1470,7 +1471,7 @@ define('pgadmin.node.server', [
}) })
.fail(function(xhr, status, error) { .fail(function(xhr, status, error) {
tree.setInode(item); tree.setInode(item);
if (data.shared){ if (data.shared && pgAdmin.server_mode == 'True'){
tree.addIcon(item, {icon: 'icon-shared-server-not-connected'}); tree.addIcon(item, {icon: 'icon-shared-server-not-connected'});
}else{ }else{
tree.addIcon(item, {icon: 'icon-server-not-connected'}); tree.addIcon(item, {icon: 'icon-server-not-connected'});