From fe3dc36ec67496aa078963997e86ea8cef65645d Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Thu, 22 Sep 2022 14:23:11 +0200 Subject: [PATCH 1/1] fixes --- src/documents/views.py | 6 +++--- src/fileupload/views.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/documents/views.py b/src/documents/views.py index ea222361..a5b99710 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -99,7 +99,7 @@ def activity(request, isodate=None): @never_cache def logout_then_redirect(request): auth.logout(request) - return http.HttpResponseRedirect(urlquote_plus(request.GET.get('next', '/'), safe='/?=')) + return http.HttpResponseRedirect(quote_plus(request.GET.get('next', '/'), safe='/?=')) @permission_required('documents.add_book') @@ -444,7 +444,7 @@ def chunk_edit(request, slug, chunk): form.save() go_next = request.GET.get('next', None) if go_next: - go_next = urlquote_plus(unquote(iri_to_uri(go_next)), safe='/?=&') + go_next = quote_plus(unquote(iri_to_uri(go_next)), safe='/?=&') else: go_next = doc.book.get_absolute_url() return http.HttpResponseRedirect(go_next) @@ -455,7 +455,7 @@ def chunk_edit(request, slug, chunk): if referer: parts = urlsplit(referer) parts = ['', ''] + list(parts[2:]) - go_next = urlquote_plus(urlunsplit(parts)) + go_next = quote_plus(urlunsplit(parts)) else: go_next = '' diff --git a/src/fileupload/views.py b/src/fileupload/views.py index 56a198ed..23fbc3bb 100644 --- a/src/fileupload/views.py +++ b/src/fileupload/views.py @@ -98,7 +98,7 @@ class UploadView(FormView): return super(UploadView, self).dispatch(request, *args, **kwargs) def get(self, request, *args, **kwargs): - if request.is_ajax(): + if request.headers.get('x-requested-with') == 'XMLHttpRequest': files = [] path = self.get_safe_path() if os.path.isdir(path): -- 2.20.1