Fixed that the sidebar may be displayed empty (#15414).

git-svn-id: http://svn.redmine.org/redmine/trunk@12310 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-11-20 19:17:20 +00:00
parent 7df9f8d31e
commit bba304ef39
2 changed files with 13 additions and 8 deletions

View File

@@ -1173,18 +1173,13 @@ module ApplicationHelper
super sources, options
end
def content_for(name, content = nil, &block)
@has_content ||= {}
@has_content[name] = true
super(name, content, &block)
end
# TODO: remove this in 2.5.0
def has_content?(name)
(@has_content && @has_content[name]) || false
content_for?(name)
end
def sidebar_content?
has_content?(:sidebar) || view_layouts_base_sidebar_hook_response.present?
content_for?(:sidebar) || view_layouts_base_sidebar_hook_response.present?
end
def view_layouts_base_sidebar_hook_response