浏览代码

[notebook] Fix CSV/XLS download of results

Enrico Berti 10 年之前
父节点
当前提交
94a52e2

+ 9 - 7
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -2047,6 +2047,15 @@ ${ require.config() }
         });
       }
 
+      function downloadResult (snippet, format) {
+        $('#snippet_' + snippet.id()).find('.download-format').val(format);
+        $('#snippet_' + snippet.id()).find('input[name=\'notebook\']').val(ko.mapping.toJSON(viewModel.selectedNotebook().getContext()));
+        $('#snippet_' + snippet.id()).find('input[name=\'snippet\']').val(ko.mapping.toJSON(snippet.getContext()));
+        $('#snippet_' + snippet.id()).find('.download-form').submit();
+      }
+
+      window.downloadResult = downloadResult;
+
       forceChartDraws();
 
       $(".CodeMirror").each(function () {
@@ -2063,13 +2072,6 @@ ${ require.config() }
     });
   });
 
-  function downloadResult (snippet, format) {
-    $('#snippet_' + snippet.id()).find('.download-format').val(format);
-    $('#snippet_' + snippet.id()).find('input[name=\'notebook\']').val(ko.mapping.toJSON(viewModel.selectedNotebook().getContext()));
-    $('#snippet_' + snippet.id()).find('input[name=\'snippet\']').val(ko.mapping.toJSON(snippet.getContext()));
-    $('#snippet_' + snippet.id()).find('.download-form').submit();
-  }
-
   var mathjax = document.createElement("script");
   mathjax.src = "//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
   mathjax.async = false;

+ 1 - 1
desktop/libs/notebook/src/notebook/views.py

@@ -152,7 +152,7 @@ def download(request):
   snippet = json.loads(request.POST.get('snippet', '{}'))
   file_format = request.POST.get('format', 'csv')
 
-  return get_api(request.user, snippet).download(notebook, snippet, file_format)
+  return get_api(request.user, snippet, request.fs, request.jt).download(notebook, snippet, file_format)
 
 
 def install_examples(request):