Skip to content

WIP: don't show pages where ancestors are unpublished #33

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

Open
iphilgood wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: don't show pages where ancestors are unpublished #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcd9fa1
WIP: don't show pages where ancestors are unpublished
iphilgood Jun 10, 2015
c4bf2f0
Merge branch 'master' into features/unpublished_ancestors
alexanderadam Aug 11, 2015
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
1 change: 1 addition & 0 deletions app/controllers/qbrick/pages_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ def redirect_page?

def find_page_by_path
@page = Qbrick::Page.published.find_by_path params[:url].to_s
raise ActionController::RoutingError, 'Not Found' if @page && [email protected]?
end
end
end
3 changes: 2 additions & 1 deletion app/models/qbrick/page.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class Page < ActiveRecord::Base
default_scope { order 'position ASC' }

scope :published, -> { where locale_attr(:published) => Qbrick::PublishState::PUBLISHED }
scope :unpublished, -> { where.not locale_attr(:published) => Qbrick::PublishState::PUBLISHED }
scope :translated, -> { where.not locale_attr(:path) => [nil, ''], locale_attr(:title) => [nil, ''] }

scope :content_page, -> { where page_type: Qbrick::PageType::CONTENT }
Expand Down Expand Up @@ -92,7 +93,7 @@ def without_self
end

def published?
published == Qbrick::PublishState::PUBLISHED
published == Qbrick::PublishState::PUBLISHED && !ancestors.unpublished.present?
end

def state_class
Expand Down