Use note.closed? in a consistent way

[rails.git] / app / views / notes / _note.rss.builder

diff --git a/app/views/notes/_note.rss.builder b/app/views/notes/_note.rss.builder
index cffc3f271c2d75ddde6adaf070aebdffae15825c..802f3bc81b6b721aef82f81e67ab122cbe386502 100644 (file)
--- a/app/views/notes/_note.rss.builder
+++ b/app/views/notes/_note.rss.builder
@@ -1,7 +1,7 @@
 xml.item do
   location = describe_location(note.lat, note.lon, 14, locale)
 
 xml.item do
   location = describe_location(note.lat, note.lon, 14, locale)
 

-  if note.status == "closed"
+  if note.closed?

     xml.title t('note.rss.closed', :place => location)
   elsif note.comments.length > 1
     xml.title t('note.rss.comment', :place => location)
     xml.title t('note.rss.closed', :place => location)
   elsif note.comments.length > 1
     xml.title t('note.rss.comment', :place => location)


@@ -12,7 +12,11 @@ xml.item do
   xml.link browse_note_url(note)
   xml.guid note_url(note)
   xml.description render(:partial => "description", :object => note, :formats => [ :html ])
   xml.link browse_note_url(note)
   xml.guid note_url(note)
   xml.description render(:partial => "description", :object => note, :formats => [ :html ])

-  xml.author note.comments.first.author_name
+
+  if note.author
+    xml.author note.author.display_name
+  end
+

   xml.pubDate note.updated_at.to_s(:rfc822)
   xml.geo :lat, note.lat
   xml.geo :long, note.lon
   xml.pubDate note.updated_at.to_s(:rfc822)
   xml.geo :lat, note.lat
   xml.geo :long, note.lon