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

1) Fix issue where SSH tunnel connection using password is failing, it's regression of Master Password. Fixes #4320

Browse Source 
2) Fix some more issues related to SSH Tunnel(By: Akshay Joshi)
This commit is contained in:
Aditya Toshniwal
2019-06-05 12:07:24 +05:30
committed by Akshay Joshi
parent 13704a4f34
commit a588c2994d
5 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -918,19 +918,19 @@ define('pgadmin.node.server', [
id: 'tunnel_host', label: gettext('Tunnel host'), type: 'text', group: gettext('SSH Tunnel'),
mode: ['properties', 'edit', 'create'], deps: ['use_ssh_tunnel'],
disabled: function(model) {
return !model.get('use_ssh_tunnel');
return !model.get('use_ssh_tunnel') || model.get('connected');
},
},{
id: 'tunnel_port', label: gettext('Tunnel port'), type: 'int', group: gettext('SSH Tunnel'),
mode: ['properties', 'edit', 'create'], deps: ['use_ssh_tunnel'], max: 65535,
disabled: function(model) {
return !model.get('use_ssh_tunnel');
return !model.get('use_ssh_tunnel') || model.get('connected');
},
},{
id: 'tunnel_username', label: gettext('Username'), type: 'text', group: gettext('SSH Tunnel'),
mode: ['properties', 'edit', 'create'], deps: ['use_ssh_tunnel'],
disabled: function(model) {
return !model.get('use_ssh_tunnel');
return !model.get('use_ssh_tunnel') || model.get('connected');
},
},{
id: 'tunnel_authentication', label: gettext('Authentication'), type: 'switch',
@@ -939,7 +939,7 @@ define('pgadmin.node.server', [
'offText': gettext('Password'), 'size': 'mini', width: '90'},
deps: ['use_ssh_tunnel'],
disabled: function(model) {
return !model.get('use_ssh_tunnel');
return !model.get('use_ssh_tunnel') || model.get('connected');
},
}, {
id: 'tunnel_identity_file', label: gettext('Identity file'), type: 'text',
@@ -963,7 +963,7 @@ define('pgadmin.node.server', [
group: gettext('SSH Tunnel'), control: 'input', mode: ['create'],
deps: ['use_ssh_tunnel'],
disabled: function(model) {
return !model.get('use_ssh_tunnel');
return !model.get('use_ssh_tunnel') || model.get('connected');
},
}, {
id: 'save_tunnel_password', controlLabel: gettext('Save password?'),

2
web/pgadmin/browser/server_groups/servers/templates/servers/tunnel_password.html
View File

@@ -14,7 +14,7 @@
<div class="save-password-div input-group py-2">
<div class="w-100">
<input id="save_tunnel_password" name="save_tunnel_password" type="checkbox"
{% if not config.ALLOW_SAVE_PASSWORD %}disabled{% endif %}
{% if not config.ALLOW_SAVE_TUNNEL_PASSWORD %}disabled{% endif %}
>
<label for="save_tunnel_password" class="ml-1">Save Password</label>
</div>