Преглед на файлове

HUE-827 [beeswax] Upload a file in create table "upload" button broken in IE

Removed background-color property on button (renders as transparent on IE)
Fixed datatable error on Table List
Fixed upload functionality for IE: changed upload iframe form and content type on views.py
Enrico Berti преди 13 години
родител
ревизия
14cfb82560

+ 1 - 1
apps/beeswax/src/beeswax/templates/show_tables.mako

@@ -88,7 +88,7 @@ ${layout.menubar(section='tables')}
 			"bFilter": false,
 			"aoColumns": [
 				null,
-				{ "sWidth": "130px", "bSortable" : false },
+				{ "sWidth": "130px", "bSortable" : false }
 			 ]
 		});
 

+ 2 - 2
apps/filebrowser/src/filebrowser/views.py

@@ -885,11 +885,11 @@ def upload(request):
         response['data'] = _('A POST request is required.')
 
     if response['status'] == 0:
-        request.info(_('%(destination)s upload succeded') % {'destination': response['path']})
+        request.info(_('%(destination)s upload succeeded') % {'destination': response['path']})
     else:
         request.error(_('Upload failed: %(data)s') % {'data': response['data']})
 
-    return HttpResponse(json.dumps(response), mimetype="application/json")
+    return HttpResponse(json.dumps(response), content_type="text/plain")
 
 
 def _upload(request):

+ 0 - 2
desktop/core/static/ext/css/fileuploader.css

@@ -16,8 +16,6 @@
     text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
     vertical-align: middle;
     cursor: pointer;
-    background-color: #f5f5f5;
-    *background-color: #e6e6e6;
     background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
     background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
     background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);

+ 8 - 4
desktop/core/static/ext/js/fileuploader.js

@@ -1030,8 +1030,15 @@ qq.extend(qq.UploadHandlerForm.prototype, {
 
         var iframe = this._createIframe(id);
         var form = this._createForm(iframe, params);
+        input.name = params.fileFieldLabel;
         form.appendChild(input);
 
+        var dest = document.createElement('input');
+        dest.type = 'text';
+        dest.name = 'dest';
+        dest.value = params.dest;
+        form.appendChild(dest);
+
         var self = this;
         this._attachLoadEvent(iframe, function(){
             self.log('iframe loaded');
@@ -1126,9 +1133,7 @@ qq.extend(qq.UploadHandlerForm.prototype, {
         // Because in this case file won't be attached to request
         var form = qq.toElement('<form method="post" enctype="multipart/form-data"></form>');
 
-        var queryString = qq.obj2url(params, this._options.action);
-
-        form.setAttribute('action', queryString);
+        form.setAttribute('action', this._options.action);
         form.setAttribute('target', iframe.name);
         form.style.display = 'none';
         document.body.appendChild(form);
@@ -1222,7 +1227,6 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
             }
         };
 
-       // var queryString = qq.obj2url(params, this._options.action);
         var formData = new FormData();
         formData.append(params.fileFieldLabel, file);
         formData.append('dest', params.dest);