Эх сурвалжийг харах

[spark] Hide and not load Assist if Beeswax is blacklisted

Enrico Berti 10 жил өмнө
parent
commit
3ab7bc545c

+ 9 - 3
apps/spark/src/spark/templates/editor.mako

@@ -168,7 +168,7 @@ ${ commonheader(_('Query'), app_name, user, "68px") | n,unicode }
 </div>
 
 
-<a title="${_('Toggle Assist')}" class="pointer show-assist" data-bind="visible: !$root.isAssistVisible(), click: $root.toggleAssist">
+<a title="${_('Toggle Assist')}" class="pointer show-assist" data-bind="visible: !$root.isAssistVisible() && $root.isAssistAvailable(), click: $root.toggleAssist">
   <i class="fa fa-chevron-right"></i>
 </a>
 
@@ -1116,8 +1116,14 @@ ${ commonheader(_('Query'), app_name, user, "68px") | n,unicode }
     assist.getData(null, force);
   }
 
-  loadAssistMain();
-
+  if (assist.options.baseURL != ""){
+    loadAssistMain();  
+  }
+  else {
+    viewModel.isAssistVisible(false);
+    viewModel.isAssistAvailable(false);
+  }
+  
   function reloadAssist() {
     loadAssistMain(true);
   }

+ 2 - 1
apps/spark/static/js/spark.ko.js

@@ -617,12 +617,13 @@ function EditorViewModel(notebooks, options) {
     self.isEditing(! self.isEditing());
   };
 
+  self.isAssistAvailable = ko.observable(true);
+  
   self.isAssistVisible = ko.observable(options.assistVisible);
   self.toggleAssist = function () {
     self.isAssistVisible(! self.isAssistVisible());
     $(document).trigger("toggleAssist");
   };
-  self.isAssistVisible = ko.observable(options.assistVisible);
 
   self.assistContent = ko.observable();
   self.assistSelectedMainObject = ko.observable();