Fix issues found during testing. #6229, #6836

This commit is contained in:
Aditya Toshniwal
2023-10-12 16:58:46 +05:30
parent 10adb6a11b
commit 3a62fc5a2a
4 changed files with 8 additions and 8 deletions

View File

@@ -401,8 +401,7 @@ class ServerModule(sg.ServerGroupPluginModule):
db.session.delete(shared_server)
db.session.commit()
current_app.logger.exception(e)
return internal_server_error(errormsg=str(e))
raise e
@staticmethod
def get_shared_server(server, gid):
@@ -1203,6 +1202,7 @@ class ServerNode(PGChildNodeView):
False) else 0,
tunnel_identity_file=data.get('tunnel_identity_file', None),
shared=data.get('shared', None),
shared_username=data.get('shared_username', None),
passexec_cmd=data.get('passexec_cmd', None),
passexec_expiration=data.get('passexec_expiration', None),
kerberos_conn=1 if data.get('kerberos_conn', False) else 0,

View File

@@ -136,11 +136,10 @@ export default class ServerSchema extends BaseUISchema {
controlProps: { maxLength: 64},
mode: ['properties', 'create', 'edit'], deps: ['shared', 'username'],
readonly: (s)=>{
if(!this.origData.shared && s.shared) {
return false;
}
return true;
}, visible: (s)=>!obj.isShared(s),
return !(!this.origData.shared && s.shared);
}, visible: ()=>{
return current_user.is_admin && pgAdmin.server_mode == 'True';
},
depChange: (state, source, _topState, actionObj)=>{
let ret = {};
if(this.origData.shared) {