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 JSON files should be downloaded properly from the storage manager. Fixes #7118

Browse Source
This commit is contained in:
Rahul Shirsat
2022-01-25 20:17:50 +05:30
committed by Akshay Joshi
parent 04729f63b8
commit deab1bfaba
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/misc/file_manager/__init__.py
View File

@@ -1222,7 +1222,9 @@ class Filemanager(object):
else:
dir_path = os.path.dirname(path)
response = send_from_directory(dir_path, name, as_attachment=True)
response = send_from_directory(dir_path, name,
mimetype='application/octet-stream',
as_attachment=True)
response.headers["filename"] = name
return response

15
web/pgadmin/tools/storage_manager/__init__.py
View File

@@ -9,19 +9,12 @@
"""A blueprint module implementing the storage manager functionality"""
import simplejson as json
import os
from flask import url_for, Response, render_template, request, current_app
from flask import url_for, Response, render_template
from flask_babel import gettext as _
from flask_security import login_required, current_user
from pgadmin.misc.bgprocess.processes import BatchProcess, IProcessDesc
from pgadmin.utils import PgAdminModule, get_storage_directory, html, \
fs_short_path, document_dir, IS_WIN, does_utility_exist
from pgadmin.utils.ajax import make_json_response, bad_request
from flask_security import login_required
from config import PG_DEFAULT_DRIVER
from pgadmin.model import Server
from pgadmin.utils import PgAdminModule
from pgadmin.utils.ajax import bad_request
from pgadmin.utils.constants import MIMETYPE_APP_JS
MODULE_NAME = 'storage_manager'