Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to render pagination and listnav on list view. #436

Merged
merged 1 commit into from
Feb 20, 2017
Merged

Fix to render pagination and listnav on list view. #436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/helpers/application_helper/page_layouts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def layout_uses_listnav?

return false if @showtype == "dialog_provision"

return false if @showtype == "dashboard"
return false if @showtype == "dashboard" && @lastaction.ends_with?("_dashboard")

return false if @showtype == "consumption"

Expand Down Expand Up @@ -73,7 +73,7 @@ def layout_uses_tabs?
(@layout == "report" && ["new", "create", "edit", "copy", "update", "explorer"].include?(controller.action_name))
return false
elsif %w(container_dashboard dashboard ems_infra_dashboard).include?(@layout) ||
%w(dashboard topology).include?(@showtype)
(%w(dashboard topology).include?(@showtype) && @lastaction.ends_with?("_dashboard"))
# Dashboard tabs are located in taskbar because they are otherwise hidden behind the taskbar regardless of z-index
return false
end
Expand Down