瀏覽代碼

[spark] Save script in the editor

Parameters are not saved yet as they need to be re-designed.
Romain Rigaux 12 年之前
父節點
當前提交
bf982df
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      apps/spark/src/spark/api.py
  2. 1 1
      apps/spark/src/spark/forms.py
  3. 2 2
      apps/spark/src/spark/templates/editor.mako

+ 1 - 1
apps/spark/src/spark/api.py

@@ -161,7 +161,7 @@ def execute(request, design_id=None):
         results = api.submit_job(
             form.cleaned_data['appName'],
             form.cleaned_data['classPath'],
-            data=form.cleaned_data['query'],
+            data=form.cleaned_data['params'],
             context=None if form.cleaned_data['autoContext'] else form.cleaned_data['context'],
             sync=False
         )

+ 1 - 1
apps/spark/src/spark/forms.py

@@ -22,7 +22,7 @@ from beeswax.forms import SaveForm
 
 
 class SparkForm(forms.Form):
-  query = forms.CharField(label=_t("Script parameters"),
+  params = forms.CharField(label=_t("Script parameters"),
                           required=False)
   classPath = forms.CharField(label=_t("Class path"),
                           required=True)

+ 2 - 2
apps/spark/src/spark/templates/editor.mako

@@ -473,13 +473,13 @@ ${ common.navbar('editor') }
 
   function tryExecuteQuery() {
     var query = getHighlightedQuery() || codeMirror.getValue();
-    viewModel.query.query(query);
+    viewModel.query.params(query);
     viewModel.executeQuery();
   }
 
   function trySaveQuery() {
     var query = getHighlightedQuery() || codeMirror.getValue();
-    viewModel.query.query(query);
+    viewModel.query.params(query);
     if (viewModel.query.id() && viewModel.query.id() != -1) {
       viewModel.saveQuery();
     }