Unverified Commit 1a911ddc authored by Petrus Janse van Rensburg's avatar Petrus Janse van Rensburg Committed by GitHub

Merge pull request #1726 from kongminhao/master

Fix #1725
parents 806fed17 674c7f0e
...@@ -38,7 +38,7 @@ if not PY2: ...@@ -38,7 +38,7 @@ if not PY2:
# Various tools # Various tools
from functools import reduce from functools import reduce
from urllib.parse import urljoin, urlparse from urllib.parse import urljoin, urlparse, quote
else: else:
text_type = unicode text_type = unicode
string_types = (str, unicode) string_types = (str, unicode)
...@@ -62,6 +62,7 @@ else: ...@@ -62,6 +62,7 @@ else:
# Helpers # Helpers
reduce = __builtins__['reduce'] if isinstance(__builtins__, dict) else __builtins__.reduce reduce = __builtins__['reduce'] if isinstance(__builtins__, dict) else __builtins__.reduce
from urlparse import urljoin, urlparse from urlparse import urljoin, urlparse
from urllib import quote
def with_metaclass(meta, *bases): def with_metaclass(meta, *bases):
......
...@@ -12,7 +12,7 @@ from werkzeug import secure_filename ...@@ -12,7 +12,7 @@ from werkzeug import secure_filename
from wtforms import fields, validators from wtforms import fields, validators
from flask_admin import form, helpers from flask_admin import form, helpers
from flask_admin._compat import urljoin, as_unicode from flask_admin._compat import urljoin, as_unicode, quote
from flask_admin.base import BaseView, expose from flask_admin.base import BaseView, expose
from flask_admin.actions import action, ActionsMixin from flask_admin.actions import action, ActionsMixin
from flask_admin.babel import gettext, lazy_gettext from flask_admin.babel import gettext, lazy_gettext
...@@ -944,7 +944,7 @@ class BaseFileAdmin(BaseView, ActionsMixin): ...@@ -944,7 +944,7 @@ class BaseFileAdmin(BaseView, ActionsMixin):
base_url = self.get_base_url() base_url = self.get_base_url()
if base_url: if base_url:
base_url = urljoin(self.get_url('.index_view'), base_url) base_url = urljoin(self.get_url('.index_view'), base_url)
return redirect(urljoin(base_url, path)) return redirect(urljoin(quote(base_url), quote(path)))
return self.storage.send_file(directory) return self.storage.send_file(directory)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment