소스 검색

HUE-4855 [notebook] Get a consistent notebook based on how the editor is open

And not by picking up the first available language.
Romain Rigaux 9 년 전
부모
커밋
c1d11ab273
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      apps/oozie/src/oozie/models2.py
  2. 1 1
      desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

+ 1 - 1
apps/oozie/src/oozie/models2.py

@@ -3496,7 +3496,7 @@ class WorkflowBuilder():
 
     for document in documents:
       if document.type == 'query-java':
-        node = self.get_java_document_node(document, name)
+        node = self.get_java_document_node(document)
       elif document.type == 'query-hive':
         node = self.get_hive_document_node(document, user)
       elif document.type == 'query-spark2':

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

@@ -1341,7 +1341,7 @@
     self.isSaved = ko.observable(typeof notebook.isSaved != "undefined" && notebook.isSaved != null ? notebook.isSaved : false);
     self.canWrite = ko.observable(typeof notebook.can_write != "undefined" && notebook.can_write != null ? notebook.can_write : true);
     self.snippets = ko.observableArray();
-    self.selectedSnippet = ko.observable(vm.availableSnippets().length > 0 ? vm.availableSnippets()[0].type() : 'NO_SNIPPETS');
+    self.selectedSnippet = ko.observable(vm.editorType()); // Aka selectedSnippetType
     self.creatingSessionLocks = ko.observableArray();
     self.sessions = ko.mapping.fromJS(typeof notebook.sessions != "undefined" && notebook.sessions != null ? notebook.sessions : [], {
       create: function(value) {