Tenants: hide toolbar when clicking on Services, Automate Domains, Pr…

…oviders.
ManageIQ · Sep 18, 2019 · 32ef759 · 32ef759
1 parent 3a19f35
commit 32ef759
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/app/assets/javascripts/miq_explorer.js b/app/assets/javascripts/miq_explorer.js
@@ -74,6 +74,7 @@ ManageIQ.explorer.processButtons = function(data) {
 ManageIQ.explorer.processReplaceMainDiv = function(data) {
   ManageIQ.explorer.updateRightCellText(data);
   ManageIQ.explorer.updatePartials(data);
+  ManageIQ.explorer.setVisibility(data);
 };
 
 ManageIQ.explorer.processFlash = function(data) {
@@ -163,6 +164,20 @@ ManageIQ.explorer.updateRightCellText = function(data) {
   }
 };
 
+ManageIQ.explorer.setVisibility = function(data) {
+  if (_.isObject(data.setVisibility)) {
+    _.forEach(data.setVisibility, function(visible, element) {
+      if ( miqDomElementExists(element) ) {
+        if ( visible ) {
+          $('#' + element).show();
+        } else {
+          $('#' + element).hide();
+        }
+      }
+    });
+  }
+};
+
 ManageIQ.explorer.processReplaceRightCell = function(data) {
   /* variables for the expression editor */
   if (_.isObject(data.expEditor)) {
@@ -247,18 +262,7 @@ ManageIQ.explorer.processReplaceRightCell = function(data) {
     ManageIQ.grids.gtl_list_grid = undefined;
   }
 
-  if (_.isObject(data.setVisibility)) {
-    _.forEach(data.setVisibility, function(visible, element) {
-      if ( miqDomElementExists(element) ) {
-        if ( visible ) {
-          $('#' + element).show();
-        } else {
-          $('#' + element).hide();
-        }
-      }
-    });
-  }
-
+  ManageIQ.explorer.setVisibility(data);
   ManageIQ.explorer.scrollTop(data);
   ManageIQ.explorer.updateRightCellText(data);
 

diff --git a/app/controllers/ops_controller.rb b/app/controllers/ops_controller.rb
@@ -904,7 +904,9 @@ def nested_list(model, options = {})
       :name  => @record.name,
       :title => options[:breadcrumb_title]
     }
-    ex = ExplorerPresenter.main_div(:right_cell_text => title).update('ops_tabs', render_to_string(:partial => "layouts/gtl"))
+    ex = ExplorerPresenter.main_div(:right_cell_text => title)
+                          .update('ops_tabs', render_to_string(:partial => "layouts/gtl"))
+                          .set_visibility(false, :toolbar)
 
     # Also update breadcrumbs.
     add_to_breadcrumbs(:title => options[:breadcrumb_title])

diff --git a/app/presenters/explorer_presenter.rb b/app/presenters/explorer_presenter.rb
@@ -223,6 +223,7 @@ def for_render_main_div
     data = check_spinner(:explorer => 'replace_main_div')
     data[:rightCellText] = escape_if_unsafe(@options[:right_cell_text]) if @options[:right_cell_text]
     data[:updatePartials] = @options[:update_partials]
+    data[:setVisibility] = @options[:set_visible_elements]
     data
   end