From a2495c843ebf205d620e852ed9ab76ef250411b9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 7 May 2011 17:36:57 +0100 Subject: [PATCH] Detabify and tidy up some more of the bugs code --- app/views/map_bugs/rss.rss.builder | 61 ++++++++++++++++-------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/app/views/map_bugs/rss.rss.builder b/app/views/map_bugs/rss.rss.builder index a6487a024..f5b597dd7 100644 --- a/app/views/map_bugs/rss.rss.builder +++ b/app/views/map_bugs/rss.rss.builder @@ -8,42 +8,45 @@ xml.rss("version" => "2.0", xml.description t('bugs.rss.description_area', :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon ) xml.link url_for(:controller => "site", :action => "index", :only_path => false) - for comment in @comments + @comments.each do |comment| xml.item do - if comment.event == "closed" - xml.title t('bugs.rss.closed', :place => comment.map_bug.nearby_place) - else if comment.event == "commented" - xml.title t('bugs.rss.comment', :place => comment.map_bug.nearby_place) - else if comment.event == "opened" - xml.title t('bugs.rss.new', :place => comment.map_bug.nearby_place) - else - xml.title "unknown event" - end end end + if comment.event == "closed" + xml.title t('bugs.rss.closed', :place => comment.map_bug.nearby_place) + elsif comment.event == "commented" + xml.title t('bugs.rss.comment', :place => comment.map_bug.nearby_place) + elsif comment.event == "opened" + xml.title t('bugs.rss.new', :place => comment.map_bug.nearby_place) + else + xml.title "unknown event" + end xml.link url_for(:controller => "browse", :action => "bug", :id => comment.map_bug.id, :only_path => false) - xml.guid url_for(:controller => "browse", :action => "bug", :id => comment.map_bug.id, :only_path => false) + xml.guid url_for(:controller => "browse", :action => "bug", :id => comment.map_bug.id, :only_path => false) - description_text = "" - if (comment.event == "commented") and (not comment.nil?) - description_text += " Comment:
" - description_text += htmlize(comment.comment) - description_text += "
" - end - description_text += " Full bug report:
" - description_text += comment.map_bug.flatten_comment("
", comment.date_created) - xml.description description_text + description_text = "" - if (comment.user.nil?) - xml.author comment.commenter_name - else - xml.author comment.user.display_name - end + if comment.event == "commented" and not comment.nil? + description_text += "Comment:
" + description_text += htmlize(comment.comment) + description_text += "
" + end + + description_text += "Full bug report:
" + description_text += comment.map_bug.flatten_comment("
", comment.date_created) + + xml.description description_text + + if comment.user.nil? + xml.author comment.commenter_name + else + xml.author comment.user.display_name + end xml.pubDate comment.date_created.to_s(:rfc822) - xml.geo :lat, comment.map_bug.lat - xml.geo :long, comment.map_bug.lon - xml.georss :point, "#{comment.map_bug.lat} #{comment.map_bug.lon}" + xml.geo :lat, comment.map_bug.lat + xml.geo :long, comment.map_bug.lon + xml.georss :point, "#{comment.map_bug.lat} #{comment.map_bug.lon}" end - end + end end end -- 2.43.2