Bladeren bron

HUE-7778 [dashboard] Only show the new toolbar plus action with grister

Romain Rigaux 8 jaren geleden
bovenliggende
commit
bd24284

+ 3 - 0
desktop/libs/dashboard/src/dashboard/static/dashboard/js/search.ko.js

@@ -1803,6 +1803,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
     self.isEditing = ko.observable(false);
     self.toggleEditing = function () {
       self.isEditing(!self.isEditing());
+      self.isToolbarVisible(self.isEditing());
     };
 
     self.isToolbarVisible = ko.observable(false);
@@ -1930,6 +1931,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
 
     self.init = function (callback) {
       self.isEditing(self.columns().length == 0);
+      self.isToolbarVisible(self.isEditing());
       self.initial.init();
       self.collection.syncFields();
       self.search(callback);
@@ -2671,6 +2673,7 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
     self.gridItems([]);
     loadSearchLayout(self, self.collectionJson.layout);
     self.isEditing(true);
+    self.isToolbarVisible(true);
     self.isRetrievingResults(false);
     self.hasRetrievedResults(true);
     self.asyncSearchesCounter([]);

+ 2 - 0
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -139,9 +139,11 @@ from dashboard.conf import USE_GRIDSTER, HAS_REPORT_ENABLED
     </div>
 
     <div class="search-bar-operations">
+      % if USE_GRIDSTER.get():
       <a class="btn pointer" title="${ _('Edit') }" rel="tooltip" data-placement="bottom" data-bind="visible: columns().length, click: function() { isToolbarVisible(!isToolbarVisible()) }, css: {'btn': true, 'btn-inverse': isToolbarVisible }">
         <i class="fa fa-plus"></i>
       </a>
+      % endif
       <a class="btn pointer" title="${ _('Edit') }" rel="tooltip" data-placement="bottom" data-bind="click: toggleEditing, css: {'btn': true, 'btn-inverse': isEditing}">
         <i class="fa fa-pencil"></i>
       </a>