Эх сурвалжийг харах

HUE-3173 [fb] The file uploaded correctly message after a desktop drop upload is shown after the first click away from FB

Enrico Berti 9 жил өмнө
parent
commit
4137517e51

+ 24 - 7
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -1380,9 +1380,14 @@ from django.utils.translation import ugettext as _
           onComplete: function (id, fileName, response) {
             self.pendingUploads(self.pendingUploads() - 1);
             if (response.status != 0) {
-              $(document).trigger("error", "${ _('Error: ') }" + response['data']);
-            } else if (self.pendingUploads() == 0) {
-              location = "/filebrowser/view=" + self.currentPath();
+              $(document).trigger('error', "${ _('Error: ') }" + response.data);
+            }
+            else {
+              $(document).trigger('info', response.path + "${ _(' uploaded successfully.') }");
+            }
+            if (self.pendingUploads() == 0) {
+              $('#uploadFileModal').modal('hide');
+              self.retrieveData();
             }
           },
           onSubmit: function (id, fileName, responseJSON) {
@@ -1443,10 +1448,17 @@ from django.utils.translation import ugettext as _
               }
             });
           },
-          onComplete: function (id, fileName, responseJSON) {
+          onComplete: function (id, fileName, response) {
             self.pendingUploads(self.pendingUploads() - 1);
+            if (response.status != 0) {
+              $(document).trigger('error', "${ _('Error: ') }" + response.data);
+            }
+            else {
+              $(document).trigger('info', response.path + "${ _(' uploaded successfully.') }");
+            }
             if (self.pendingUploads() == 0) {
-              location = "/filebrowser/view=" + self.currentPath();
+              $('#uploadArchiveModal').modal('hide');
+              self.retrieveData();
             }
           },
           onSubmit: function (id, fileName, responseJSON) {
@@ -1645,8 +1657,13 @@ from django.utils.translation import ugettext as _
             complete: function (data) {
               if (data.xhr.response != '') {
                 var response = JSON.parse(data.xhr.response);
-                if (response && response.status && response.status == -1) {
-                  $.jHueNotify.error(response.data);
+                if (response && response.status != null) {
+                  if (response.status != 0) {
+                    $(document).trigger('error', response.data);
+                  }
+                  else {
+                    $(document).trigger('info', response.path + "${ _(' uploaded successfully.') }");
+                  }
                 }
               }
             }

+ 0 - 8
apps/filebrowser/src/filebrowser/views.py

@@ -1150,9 +1150,6 @@ def upload_file(request):
     else:
         response['data'] = _('A POST request is required.')
 
-    if response['status'] == 0:
-        request.info(_('%(destination)s upload succeeded') % {'destination': response['path']})
-
     return HttpResponse(json.dumps(response), content_type="text/plain")
 
 def _upload_file(request):
@@ -1229,11 +1226,6 @@ def upload_archive(request):
     else:
         response['data'] = _('A POST request is required.')
 
-    if response['status'] == 0:
-        request.info(_('%(destination)s upload succeeded.') % {'destination': response['path']})
-    else:
-        request.error(_('Upload failed: %(data)s.') % {'data': response['data']})
-
     return HttpResponse(json.dumps(response), content_type="text/plain")