Merge pull request #1509 from martinpovolny/page_layout

Page layout methods refactoring
ManageIQ · Jun 15, 2017 · a7907c9 · a7907c9
2 parents ef15365 + bb3089b
commit a7907c9
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 99 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -733,20 +733,6 @@ def toolbars_visible?
     (@toolbars['history_tb'] != 'blank_view_tb' && @toolbars['history_tb'] != 'blank_view_tb' && @toolbars['view_tb'] != 'blank_view_tb')
   end
 
-  def inner_layout_present?
-    if @inner_layout_present.nil?
-      @inner_layout_present = false
-      if @explorer || params[:action] == "explorer" ||
-         (params[:controller] == "chargeback" && params[:action] == "chargeback") ||
-         (params[:controller] == "miq_ae_tools" && (params[:action] == "resolve" || params[:action] == "show")) ||
-         (params[:controller] == "miq_policy" && params[:action] == "rsop") ||
-         (params[:controller] == "miq_capacity")
-        @inner_layout_present = true
-      end
-    end
-    @inner_layout_present
-  end
-
   # Format a column in a report view for display on the screen
   def format_col_for_display(view, row, col, tz = nil)
     tz ||= ["miqschedule"].include?(view.db.downcase) ? MiqServer.my_server.server_timezone : Time.zone
@@ -935,12 +921,6 @@ def adv_search_show_alias_checkbox?
     @edit[:adv_search_open]  # Only allow field aliases for advanced searches
   end
 
-  def saved_report_paging?
-    # saved report doesn't use miq_report object,
-    # need to use a different paging view to page thru a saved report
-    @sb[:pages] && @html && [:reports_tree, :savedreports_tree, :cb_reports_tree].include?(x_active_tree)
-  end
-
   def pressed2model_action(pressed)
     pressed =~ /^(ems_cluster|miq_template|infra_networking)_(.*)$/ ? [$1, $2] : pressed.split('_', 2)
   end
@@ -1508,69 +1488,6 @@ def render_listnav_filename
     end
   end
 
-  def show_adv_search?
-    show_search = %w(
-      auth_key_pair_cloud
-      availability_zone
-      automation_manager
-      cloud_network
-      cloud_object_store_container
-      cloud_object_store_object
-      cloud_subnet
-      cloud_tenant
-      cloud_volume
-      cloud_volume_backup
-      cloud_volume_snapshot
-      configuration_job
-      container
-      container_build
-      container_group
-      container_image
-      container_image_registry
-      container_node
-      container_project
-      container_replicator
-      container_route
-      container_service
-      container_template
-      ems_cloud
-      ems_cluster
-      ems_container
-      ems_infra
-      ems_middleware
-      ems_network
-      ems_physical_infra
-      ems_storage
-      flavor
-      floating_ip
-      host
-      host_aggregate
-      load_balancer
-      middleware_datasource
-      middleware_deployment
-      middleware_domain
-      middleware_messaging
-      middleware_server
-      miq_template
-      network_port
-      network_router
-      offline
-      orchestration_stack
-      persistent_volume
-      physical_server
-      provider_foreman
-      resource_pool
-      retired
-      security_group
-      service
-      templates
-      vm
-    )
-
-    (@lastaction == "show_list" && !session[:menu_click] && show_search.include?(@layout) && !@in_a_form) ||
-      (@explorer && x_tree && tree_with_advanced_search? && !@record)
-  end
-
   def db_for_quadicon
     case @layout
     when "ems_infra"
@@ -1637,10 +1554,6 @@ def tree_with_advanced_search?
       ).include?(x_tree[:type])
   end
 
-  def show_advanced_search?
-    x_tree && ((tree_with_advanced_search? && !@record) || @show_adv_search)
-  end
-
   def listicon_glyphicon(item)
     [item.decorate.try(:fonticon), item.decorate.try(:secondary_icon), item.decorate.try(:fileicon)] if item
   end

diff --git a/app/helpers/application_helper/page_layouts.rb b/app/helpers/application_helper/page_layouts.rb
@@ -101,4 +101,108 @@ def dashboard_no_listnav?
       show
     ).include?(controller.action_name)
   end
+
+  def center_div_partial
+    if layout_uses_listnav?
+      "layouts/center_div_with_listnav"
+    elsif dashboard_no_listnav?
+      "layouts/center_div_dashboard_no_listnav"
+    else
+      "layouts/center_div_no_listnav"
+    end
+  end
+
+  def inner_layout_present?
+    @inner_layout_present ||=
+      begin
+        @explorer || params[:action] == "explorer" ||
+          (params[:controller] == "chargeback" && params[:action] == "chargeback") ||
+          (params[:controller] == "miq_ae_tools" && (params[:action] == "resolve" || params[:action] == "show")) ||
+          (params[:controller] == "miq_policy" && params[:action] == "rsop") ||
+          (params[:controller] == "miq_capacity")
+      end
+  end
+
+  def simulate?
+    @simulate ||=
+      begin
+        rsop = controller.controller_name == 'miq_policy' && controller.action_name == 'rsop'
+        resolve = controller.controller_name == 'miq_ae_tools' && controller.action_name == 'resolve'
+        planning = controller.controller_name == 'miq_capacity' && controller.action_name == 'planning'
+        rsop || resolve || planning
+      end
+  end
+
+  def saved_report_paging?
+    # saved report doesn't use miq_report object,
+    # need to use a different paging view to page thru a saved report
+    @sb[:pages] && @html && [:reports_tree, :savedreports_tree, :cb_reports_tree].include?(x_active_tree)
+  end
+
+  def show_advanced_search?
+    x_tree && ((tree_with_advanced_search? && !@record) || @show_adv_search)
+  end
+
+  def show_adv_search?
+    show_search = %w(
+      auth_key_pair_cloud
+      availability_zone
+      automation_manager
+      cloud_network
+      cloud_object_store_container
+      cloud_object_store_object
+      cloud_subnet
+      cloud_tenant
+      cloud_volume
+      cloud_volume_backup
+      cloud_volume_snapshot
+      configuration_job
+      container
+      container_build
+      container_group
+      container_image
+      container_image_registry
+      container_node
+      container_project
+      container_replicator
+      container_route
+      container_service
+      container_template
+      ems_cloud
+      ems_cluster
+      ems_container
+      ems_infra
+      ems_middleware
+      ems_network
+      ems_physical_infra
+      ems_storage
+      flavor
+      floating_ip
+      host
+      host_aggregate
+      load_balancer
+      middleware_datasource
+      middleware_deployment
+      middleware_domain
+      middleware_messaging
+      middleware_server
+      miq_template
+      network_port
+      network_router
+      offline
+      orchestration_stack
+      persistent_volume
+      physical_server
+      provider_foreman
+      resource_pool
+      retired
+      security_group
+      service
+      templates
+      vm
+    )
+
+    (@lastaction == "show_list" && !session[:menu_click] && show_search.include?(@layout) && !@in_a_form) ||
+      (@explorer && x_tree && tree_with_advanced_search? && !@record)
+  end
 end
diff --git a/app/views/layouts/_content.html.haml b/app/views/layouts/_content.html.haml
@@ -4,12 +4,8 @@
     .row.max-height
       = yield
 - elsif inner_layout_present?
-  - rsop = controller.controller_name == 'miq_policy' && controller.action_name == 'rsop'
-  - resolve = controller.controller_name == 'miq_ae_tools' && controller.action_name == 'resolve'
-  - planning = controller.controller_name == 'miq_capacity' && controller.action_name == 'planning'
-  - simulate =  rsop || resolve || planning
   - session[:sidebar] ||= {}
-  - sidewidth = simulate ? 5 : session[:sidebar][params[:controller]] ||= 3
+  - sidewidth = simulate? ? 5 : session[:sidebar][params[:controller]] ||= 3
   - maindiv = 12 - sidewidth
   - sidebar = sidewidth == 0 ? 'hidden-md hidden-lg col-md-0' : "col-md-#{sidewidth} col-md-pull-#{maindiv}"
 
@@ -53,7 +49,7 @@
               = render(:partial => 'layouts/saved_report_paging_bar',
                        :locals  => {:pages => @sb[:pages]})
 
-        - unless simulate
+        - unless simulate?
           .resizer.hidden-xs
             .resizer-box
               .btn-group
@@ -70,12 +66,7 @@
         #custom_left_cell
 - else
   #center_div{:style => "height: 100%;"}
-    - if layout_uses_listnav?
-      = render :partial => "layouts/center_div_with_listnav"
-    - elsif dashboard_no_listnav?
-      = render :partial => "layouts/center_div_dashboard_no_listnav"
-    - else
-      = render :partial => "layouts/center_div_no_listnav"
+    = render :partial => center_div_partial
 
 - if show_advanced_search?
   :javascript