Merge pull request ManageIQ#11793 from mzazrivec/always_use_explorer_…

…layout_in_datastores_screen Always use explorer layout in datastores screen
chessbyte · Oct 13, 2016 · 3992c4c · 3992c4c
2 parents 2bc02b4 + 034195a
commit 3992c4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/controllers/application_controller/ci_processing.rb b/app/controllers/application_controller/ci_processing.rb
@@ -2610,7 +2610,7 @@ def storage_button_operation(method, display_name)
     storages = []
 
     # Either a list or coming from a different controller (eg from host screen, go to its storages)
-    if %w(show_list storage_list storage_pod_list).include?(@lastaction) || @layout != "storage"
+    if params.key?(:miq_grid_checks)
       storages = find_checked_items
 
       if method == 'scan' && !Storage.batch_operation_supported?('smartstate_analysis', storages)

diff --git a/app/controllers/storage_controller.rb b/app/controllers/storage_controller.rb
@@ -414,6 +414,7 @@ def explorer
     end
 
     build_accordions_and_trees
+    @lastaction = "explorer" # restore the explorer layout, which was changed by process_show_list() to "show_list"
 
     render :layout => "application"
   end