Removed listnav from non-explorer style summary screens and sub-screens

Fixes ManageIQ#6819
h-kataria · Apr 23, 2020 · ec32c0e · ec32c0e
1 parent 5942e8e
commit ec32c0e
Show file tree

Hide file tree

Showing 64 changed files with 1 addition and 1,775 deletions.
diff --git a/app/controllers/mixins/listnav_mixin.rb b/app/controllers/mixins/listnav_mixin.rb
diff --git a/app/helpers/application_helper/listnav.rb b/app/helpers/application_helper/listnav.rb
@@ -1,7 +1,6 @@
 module ApplicationHelper
   module Listnav
     def render_listnav_filename
-      return controller.listnav_filename if controller.respond_to?(:listnav_filename, true)
       common_layouts = %w[
         auth_key_pair_cloud
         availability_zone
@@ -72,10 +71,6 @@ def render_listnav_filename
         "compare_sections"
       elsif @explorer
         "explorer"
-      elsif @layout == "timeline"
-        controller.controller_name
-      elsif common_layouts.include?(@layout)
-        @layout
       end
     end
 

diff --git a/app/helpers/application_helper/page_layouts.rb b/app/helpers/application_helper/page_layouts.rb
@@ -1,5 +1,6 @@
 module ApplicationHelper::PageLayouts
   def layout_uses_listnav?
+    return false if @showtype == "main"
     return false if show_list_with_no_provider?
 
     return false if show_list_ansible?

diff --git a/app/views/layouts/listnav/_ansible_credential.html.haml b/app/views/layouts/listnav/_ansible_credential.html.haml
diff --git a/app/views/layouts/listnav/_ansible_playbook.html.haml b/app/views/layouts/listnav/_ansible_playbook.html.haml
diff --git a/app/views/layouts/listnav/_ansible_repository.html.haml b/app/views/layouts/listnav/_ansible_repository.html.haml
diff --git a/app/views/layouts/listnav/_auth_key_pair_cloud.html.haml b/app/views/layouts/listnav/_auth_key_pair_cloud.html.haml
diff --git a/app/views/layouts/listnav/_availability_zone.html.haml b/app/views/layouts/listnav/_availability_zone.html.haml
diff --git a/app/views/layouts/listnav/_cloud_network.html.haml b/app/views/layouts/listnav/_cloud_network.html.haml
diff --git a/app/views/layouts/listnav/_cloud_object_store_container.html.haml b/app/views/layouts/listnav/_cloud_object_store_container.html.haml
diff --git a/app/views/layouts/listnav/_cloud_object_store_object.html.haml b/app/views/layouts/listnav/_cloud_object_store_object.html.haml
diff --git a/app/views/layouts/listnav/_cloud_subnet.html.haml b/app/views/layouts/listnav/_cloud_subnet.html.haml
diff --git a/app/views/layouts/listnav/_cloud_tenant.html.haml b/app/views/layouts/listnav/_cloud_tenant.html.haml
diff --git a/app/views/layouts/listnav/_cloud_volume.html.haml b/app/views/layouts/listnav/_cloud_volume.html.haml
diff --git a/app/views/layouts/listnav/_cloud_volume_backup.html.haml b/app/views/layouts/listnav/_cloud_volume_backup.html.haml