Fix the notebook bugs. (#1465)

* Fix the notebook bugs.
Intel-bigdata · Dec 5, 2017 · e7a03ec · e7a03ec
1 parent 0652751
commit e7a03ec
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/smart-zeppelin/zeppelin-web/src/app/app.js b/smart-zeppelin/zeppelin-web/src/app/app.js
@@ -81,9 +81,6 @@ var zeppelinWebApp = angular.module('zeppelinWebApp', [
         resolve: {
           rules0: ['models', function (models) {
             return models.$get.rules();
-          }],
-          notebookInfo: ['models', function (models) {
-            return models.$get.notebookInfo();
           }]
         }
       })

diff --git a/smart-zeppelin/zeppelin-web/src/app/notebook/notebook.controller.js b/smart-zeppelin/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -18,10 +18,10 @@ NotebookCtrl.$inject = [
   '$scope',
   'ngToast',
   'rules0',
-  'notebookInfo'
+  '$rootScope'
 ];
 
-function NotebookCtrl($scope, ngToast, rules0, notenookInfo) {
+function NotebookCtrl($scope, ngToast, rules0, $rootScope) {
 
   ngToast.dismiss();
 
@@ -46,7 +46,7 @@ function NotebookCtrl($scope, ngToast, rules0, notenookInfo) {
 
   /** Init the new controller */
   var initNotebook = function() {
-    $scope.note = notenookInfo;
+    $scope.note = $rootScope.note;
   };
 
   initNotebook();

diff --git a/smart-zeppelin/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/smart-zeppelin/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -143,6 +143,7 @@ function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $locat
 
   $scope.runParagraph = function(data) {
     var submitFn;
+    $scope.paragraph.config.enabled = false;
     if ($scope.paragraph.id === 'add_rule') {
       submitFn = restapi.submitRule;
     } else if ($scope.paragraph.id === 'run_action') {

diff --git a/smart-zeppelin/zeppelin-web/src/components/navbar/navbar.controller.js b/smart-zeppelin/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -45,7 +45,7 @@ function NavCtrl($scope, $rootScope, $http, $routeParams, $location,
   initController();
 
   function getZeppelinVersion() {
-    $http.get(baseUrlSrv.getRestApiRoot() + 'smart/api/' + conf.restapiProtocol + '/system/version').success(
+    $http.get(baseUrlSrv.getSmartApiRoot() + conf.restapiProtocol + '/system/version').success(
       function(data, status, headers, config) {
         $rootScope.zeppelinVersion = data.body;
       }).error(
@@ -54,6 +54,16 @@ function NavCtrl($scope, $rootScope, $http, $routeParams, $location,
       });
   }
 
+  function getNoteInfo() {
+    $http.get(baseUrlSrv.getSmartApiRoot() + conf.restapiProtocol + '/note/info').success(
+      function(data, status, headers, config) {
+        $rootScope.note = data;
+      }).error(
+      function(data, status, headers, config) {
+        console.log('Error %o %o', status, data.message);
+      });
+  }
+
   function initController() {
     $scope.isDrawNavbarNoteList = false;
     angular.element('#notebook-list').perfectScrollbar({suppressScrollX: true});
@@ -65,7 +75,7 @@ function NavCtrl($scope, $rootScope, $http, $routeParams, $location,
     if ($rootScope.ticket && $location.path() === '/') {
       $location.path('/notebook');
     }
-
+    getNoteInfo();
     getZeppelinVersion();
   }