diff --git a/app/controllers/alchemy/pages_controller.rb b/app/controllers/alchemy/pages_controller.rb index 99d7029481..bebea754d9 100644 --- a/app/controllers/alchemy/pages_controller.rb +++ b/app/controllers/alchemy/pages_controller.rb @@ -104,14 +104,13 @@ def locale_prefix_not_allowed? # If no index page and no admin users are present we show the "Welcome to Alchemy" page. # def load_index_page - @page ||= begin - Alchemy::Page. - contentpages. - language_roots. - where(language: Language.current). - includes(page_includes). - first - end + @page ||= Alchemy::Page + .contentpages + .language_roots + .where(language: Language.current) + .includes(page_includes) + .first + render template: "alchemy/welcome", layout: false if signup_required? end @@ -127,13 +126,11 @@ def load_index_page def load_page page_not_found! unless Language.current - @page ||= begin - Alchemy::Page. - contentpages. - where(language: Language.current). - includes(page_includes). - find_by(urlname: params[:urlname]) - end + @page ||= Alchemy::Page + .contentpages + .where(language: Language.current) + .includes(page_includes) + .find_by(urlname: params[:urlname]) end def enforce_locale @@ -222,10 +219,12 @@ def page_etag # or the cache is stale, because it's been republished by the user. # def render_fresh_page? - must_not_cache? || stale?(etag: page_etag, - last_modified: @page.published_at, - public: !@page.restricted, - template: "pages/show") + must_not_cache? || stale?( + etag: page_etag, + last_modified: @page.published_at, + public: !@page.restricted, + template: "pages/show", + ) end # don't cache pages if we have flash message to display or the page has caching disabled