From 800365c20c6732f86cd4020b28c77e82c7253740 Mon Sep 17 00:00:00 2001 From: Doug Youch Date: Mon, 8 Feb 2010 19:58:32 +0000 Subject: [PATCH] Properly draw 404s. Can edit list and details paragraphs to the same page now. --- .../blog/app/controllers/blog/page_renderer.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/vendor/modules/blog/app/controllers/blog/page_renderer.rb b/vendor/modules/blog/app/controllers/blog/page_renderer.rb index 14934cfd..debc8702 100644 --- a/vendor/modules/blog/app/controllers/blog/page_renderer.rb +++ b/vendor/modules/blog/app/controllers/blog/page_renderer.rb @@ -34,12 +34,15 @@ def entry_list # list_type = category, list_type_identifier = something list_connection_type,list_type = page_connection(:type) list_connection_detail,list_type_identifier = page_connection(:identifier) - - list_type = list_type.downcase unless list_type.blank? - unless (['category','tag','archive'].include?(list_type.to_s)) - list_type = nil + + if list_type + list_type = list_type.downcase unless list_type.blank? + unless (['category','tag','archive'].include?(list_type.to_s)) + raise SiteNodeEngine::MissingPageException.new(site_node, language) if list_type_identifier && site_node.id == @options.detail_page_id + return render_paragraph :text => '' + end end - + if list_type == 'category' set_page_connection(:category, list_type_identifier) end @@ -106,6 +109,7 @@ def entry_detail set_title(result.title) set_content_node(['Blog::BlogPost', result.entry_id]) else + return render_paragraph :text => '' if (['', 'category','tag','archive'].include?(conn_id.to_s)) && site_node.id == @options.list_page_id raise SiteNodeEngine::MissingPageException.new( site_node, language ) unless editor? end