Upgrade filebrowser; minor fixes relevant to the upgrade.

[redakcja.git] / src / fileupload / views.py

diff --git a/src/fileupload/views.py b/src/fileupload/views.py
index eb7959c..ddae62b 100644 (file)
--- a/src/fileupload/views.py
+++ b/src/fileupload/views.py
@@ -1,3 +1,6 @@
+# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import json
 import os
 from urllib.parse import quote
 import json
 import os
 from urllib.parse import quote


@@ -95,7 +98,7 @@ class UploadView(FormView):
         return super(UploadView, self).dispatch(request, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
         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):
             files = []
             path = self.get_safe_path()
             if os.path.isdir(path):


@@ -116,9 +119,8 @@ class UploadView(FormView):
                                 quote(f.encode('utf-8'))),
                             'delete_type': "DELETE"
                         })
                                 quote(f.encode('utf-8'))),
                             'delete_type': "DELETE"
                         })

-                        thumbnail_url = thumbnail(self.get_directory() + f),

                     files.append(file_info)
                     files.append(file_info)

-            return JSONResponse(files)
+            return JSONResponse({"files": files})

         else:
             return super(UploadView, self).get(request, *args, **kwargs)
 
         else:
             return super(UploadView, self).get(request, *args, **kwargs)
 


@@ -141,7 +143,7 @@ class UploadView(FormView):
                             quote(f.name.encode('utf-8'))),
                 'delete_type': "DELETE"
             })
                             quote(f.name.encode('utf-8'))),
                 'delete_type': "DELETE"
             })

-        response = JSONResponse(data)
+        response = JSONResponse({"files": data})

         response['Content-Disposition'] = 'inline; filename=files.json'
         return response
 
         response['Content-Disposition'] = 'inline; filename=files.json'
         return response