github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

not showing unlisted pages in the nav

Browse Source
This commit is contained in:
Dirk Kelly 2011-02-01 14:43:07 +08:00
parent 36053733f7
commit 2d3c0e974f
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/locomotive/liquid/tags/nav.rb
View File

@ -106,7 +106,7 @@ module Locomotive
# Determines whether or not a page should be a part of the menu # Determines whether or not a page should be a part of the menu
def include_page?(page) def include_page?(page)
if page.templatized? || !page.published? if page.unlisted? || page.templatized? || !page.published?
false false
elsif @options[:exclude] elsif @options[:exclude]
(page.fullpath =~ @options[:exclude]).nil? (page.fullpath =~ @options[:exclude]).nil?

11
spec/lib/locomotive/liquid/tags/nav_spec.rb
View File

@ -15,8 +15,9 @@ describe Locomotive::Liquid::Tags::Nav do
Page.new(:title => 'Child #2.1', :fullpath => 'child_2/sub_child_1', :slug => 'sub_child_1', :published => true), Page.new(:title => 'Child #2.1', :fullpath => 'child_2/sub_child_1', :slug => 'sub_child_1', :published => true),
Page.new(:title => 'Child #2.2', :fullpath => 'child_2/sub_child_2', :slug => 'sub_child_2', :published => true), Page.new(:title => 'Child #2.2', :fullpath => 'child_2/sub_child_2', :slug => 'sub_child_2', :published => true),
Page.new(:title => 'Unpublished #2.2', :fullpath => 'child_2/sub_child_unpublishd_2', :slug => 'sub_child_unpublished_2', :published => false), Page.new(:title => 'Unpublished #2.2', :fullpath => 'child_2/sub_child_unpublishd_2', :slug => 'sub_child_unpublished_2', :published => false),
Page.new(:title => 'Templatized #2.3', :fullpath => 'child_2/sub_child_template_3', :slug => 'sub_child_template_3', :published => true, :templatized => true) Page.new(:title => 'Templatized #2.3', :fullpath => 'child_2/sub_child_template_3', :slug => 'sub_child_template_3', :published => true, :templatized => true),
] Page.new(:title => 'Unlisted #2.4', :fullpath => 'child_2/sub_child_unlisted_4', :slug => 'sub_child_unlisted_4', :published => true, :unlisted => true)
]
@home.children.last.stubs(:children_with_minimal_attributes).returns(other_children) @home.children.last.stubs(:children_with_minimal_attributes).returns(other_children)
@home.children.last.stubs(:children).returns(other_children) @home.children.last.stubs(:children).returns(other_children)
@ -66,6 +67,12 @@ describe Locomotive::Liquid::Tags::Nav do
output.should_not match /sub-child-unpublished-3/ output.should_not match /sub-child-unpublished-3/
end end
it 'does not render unlisted pages' do
output = render_nav('site', {}, 'depth: 2')
output.should_not match /sub-child-unlisted-3/
end
it 'does not render nested excluded pages' do it 'does not render nested excluded pages' do
output = render_nav('site', {}, 'depth: 2, exclude: "child_2/sub_child_2"') output = render_nav('site', {}, 'depth: 2, exclude: "child_2/sub_child_2"')