浏览代码

HUE-5795 [notebook] Add the type of snippet in the execute call

Romain Rigaux 8 年之前
父节点
当前提交
6e397c9

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

@@ -156,7 +156,7 @@ def _execute_notebook(request, notebook, snippet):
 @require_POST
 @check_document_access_permission()
 @api_error_handler
-def execute(request):
+def execute(request, engine=None):
   notebook = json.loads(request.POST.get('notebook', '{}'))
   snippet = json.loads(request.POST.get('snippet', '{}'))
 

+ 1 - 1
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -1002,7 +1002,7 @@ var EditorViewModel = (function() {
 
       self.currentQueryTab('queryHistory');
 
-      self.executingBlockingOperation = $.post("/notebook/api/execute", {
+      self.executingBlockingOperation = $.post("/notebook/api/execute/" + self.type(), {
         notebook: vm.editorMode() ? ko.mapping.toJSON(notebook, NOTEBOOK_MAPPING) : ko.mapping.toJSON(notebook.getContext()),
         snippet: ko.mapping.toJSON(self.getContext())
       }, function (data) {

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

@@ -53,7 +53,7 @@ urlpatterns += patterns('notebook.api',
   url(r'^api/create_notebook/?$', 'create_notebook', name='create_notebook'),
   url(r'^api/create_session/?$', 'create_session', name='create_session'),
   url(r'^api/close_session/?$', 'close_session', name='close_session'),
-  url(r'^api/execute/?$', 'execute', name='execute'),
+  url(r'^api/execute/?(?P<engine>.+)?$', 'execute', name='execute'),
   url(r'^api/check_status/?$', 'check_status', name='check_status'),
   url(r'^api/fetch_result_data/?$', 'fetch_result_data', name='fetch_result_data'),
   url(r'^api/fetch_result_metadata/?$', 'fetch_result_metadata', name='fetch_result_metadata'),