diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb index 13909a27..1cee9f54 100644 --- a/app/controllers/admin/pages_controller.rb +++ b/app/controllers/admin/pages_controller.rb @@ -61,7 +61,7 @@ class Admin::PagesController < ApplicationController def update @item = Page.find(params[:id]) - if @item.module_app.key == 'page_content' && @item.page_contexts.blank? + if @item.module_app && @item.module_app.key == 'page_content' && @item.page_contexts.blank? @item.page_contexts.build(:create_user_id => current_user.id, :update_user_id => current_user.id ) end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index af5f412a..07d7261c 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -14,7 +14,7 @@ class PagesController < ApplicationController def show #begin @item = Item.first(:conditions => {:full_name => params[:page_name]}) - if @item.is_published + if @item && @item.is_published case @item._type when 'Page' render_page(params[:id]) diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index 10d9d4a2..df78df69 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -99,7 +99,7 @@ module ParserBackEnd ret = '' if (tag.attributes["main"] == "true" && !page.module_app.nil?) ret << "
" else part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index 2ddbb84c..4b30d9c2 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -126,7 +126,7 @@ module ParserFrontEnd ret << "
" else part = page.page_parts.detect{ |p| p.name.to_s == tag.attr['name'].to_s } rescue nil