From 32519f308fc991f628b032ae507f85ad92226097 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 2 Apr 2012 02:41:42 +0800 Subject: [PATCH] Fix several bus when there is no design --- app/models/page.rb | 2 +- lib/parsers/parser_back_end.rb | 6 +++--- lib/parsers/parser_front_end.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/page.rb b/app/models/page.rb index b9e06143..d98f3a4e 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -34,7 +34,7 @@ class Page < Item end def set_key - if title.new_record? + if title && title.new_record? title.key = 'title' end end diff --git a/lib/parsers/parser_back_end.rb b/lib/parsers/parser_back_end.rb index 12429247..24b6c59f 100644 --- a/lib/parsers/parser_back_end.rb +++ b/lib/parsers/parser_back_end.rb @@ -47,9 +47,9 @@ module ParserBackEnd ret << "'>" else part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil - ret << "
" + ret << "
" if part ret << "' case part.kind when 'text' @@ -65,7 +65,7 @@ module ParserBackEnd public_r_tags << part.public_r_tag else '' - end + end if part end scope = "<#{content.name}" content.attributes.each_pair do |key, value| diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb index c3ca1787..dfec0dd9 100644 --- a/lib/parsers/parser_front_end.rb +++ b/lib/parsers/parser_front_end.rb @@ -61,7 +61,7 @@ module ParserFrontEnd public_r_tags << part.public_r_tag else '' - end + end if part end scope = "<#{content.name}" content.attributes.each_pair do |key, value|