diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d5dbfac..e93830d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1002,17 +1002,26 @@ module ApplicationHelper def display_category_menu(block, categories, root = true) categories = categories.sort{|x,y| x.name <=> y.name} return "" if categories.blank? - content_tag(:ul, + content_tag(:ul) do categories.map do |category| category_path = category.kind_of?(ProductCategory) ? {:controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id} : { :controller => 'search', :action => 'category_index', :category_path => category.explode_path } - category.display_in_menu? ? - content_tag(:li, - ( !category.is_leaf_displayable_in_menu? ? content_tag(:a, collapsed_item_icon, :href => "#", :id => "block_#{block.id}_category_#{category.id}", :class => 'category-link-expand ' + (root ? 'category-root' : 'category-no-root'), :onclick => "expandCategory(#{block.id}, #{category.id}); return false", :style => 'display: none') : leaf_item_icon) + - link_to(content_tag(:span, category.name, :class => 'category-name'), category_path, :class => ("category-leaf" if category.is_leaf_displayable_in_menu?)) + - content_tag(:div, display_category_menu(block, category.children, false), :id => "block_#{block.id}_category_content_#{category.id}", :class => 'child-category') - ) : '' - end - ) + + if category.display_in_menu? + content_tag(:li) do + if !category.is_leaf_displayable_in_menu? + content_tag(:a, collapsed_item_icon, :href => "#", :id => "block_#{block.id}_category_#{category.id}", :class => "category-link-expand " + (root ? "category-root" : "category-no-root"), :onclick => "expandCategory(#{block.id}, #{category.id}); return false", :style => "display: none") + else + leaf_item_icon + end + + link_to(content_tag(:span, category.name, :class => "category-name"), category_path, :class => ("category-leaf" if category.is_leaf_displayable_in_menu?)) + + content_tag(:div, :id => "block_#{block.id}_category_content_#{category.id}", :class => 'child-category') do + display_category_menu(block, category.children, false) + end + end + else + "" + end + end.join.html_safe + end + content_tag(:p) + (root ? javascript_tag(" jQuery('.child-category').hide(); -- libgit2 0.21.2