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

Ensure that Backup and Restore should work on shared servers. Fixes #6385

Browse Source
This commit is contained in:
Pradip Parkale
2021-04-14 12:11:55 +05:30
committed by Akshay Joshi
parent 4ee40e348c
commit cb7bcaf939
6 changed files with 87 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
web/pgadmin/tools/maintenance/__init__.py
View File

@@ -20,7 +20,7 @@ from pgadmin.utils.ajax import bad_request, make_json_response
from pgadmin.utils.driver import get_driver
from config import PG_DEFAULT_DRIVER
from pgadmin.model import Server
from pgadmin.model import Server, SharedServer
from pgadmin.utils.constants import MIMETYPE_APP_JS
MODULE_NAME = 'maintenance'
@@ -209,8 +209,14 @@ def create_maintenance_job(sid, did):
index_name = get_index_name(data)
# Fetch the server details like hostname, port, roles etc
server = Server.query.filter_by(
id=sid).first()
if Server.query.filter_by(id=sid, user_id=current_user.id).first():
server = Server.query.filter_by(
id=sid, user_id=current_user.id
).first()
else:
server = SharedServer.query.filter_by(
id=sid, user_id=current_user.id
).first()
if server is None:
return make_json_response(
@@ -300,9 +306,18 @@ def check_utility_exists(sid):
Returns:
None
"""
server = Server.query.filter_by(
id=sid, user_id=current_user.id
).first()
# server = Server.query.filter_by(
# id=sid, user_id=current_user.id
# ).first()
if Server.query.filter_by(id=sid, user_id=current_user.id).first():
server = Server.query.filter_by(
id=sid, user_id=current_user.id
).first()
else:
server = SharedServer.query.filter_by(
id=sid, user_id=current_user.id
).first()
if server is None:
return make_json_response(