Always get the bug commenter name from the user if there is one

[rails.git] / app / views / map_bugs / rss.rss.builder

diff --git a/app/views/map_bugs/rss.rss.builder b/app/views/map_bugs/rss.rss.builder
index a6487a024d9c6fa552d602d856826ac3ff5d7374..ced183a10b61a32367a6d8da6fbeae89a4cebc17 100644 (file)
--- a/app/views/map_bugs/rss.rss.builder
+++ b/app/views/map_bugs/rss.rss.builder
@@ -8,42 +8,39 @@ 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)
 
     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
       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.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 += "<B> Comment: </B><br>"
-                       description_text += htmlize(comment.comment)
-                       description_text += "<br>"
-               end
-               description_text += "<B> Full bug report: </B><br>"
-               description_text += comment.map_bug.flatten_comment("<br>", 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 += "<b>Comment:</b><br>"
+          description_text += htmlize(comment.comment)
+          description_text += "<br>"
+        end
+
+        description_text += "<b>Full bug report:</b><br>"
+        description_text += comment.map_bug.flatten_comment("<br>", comment.date_created)
+
+        xml.description description_text 
+        xml.author comment.commenter_name

         xml.pubDate comment.date_created.to_s(:rfc822)
         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
 end
   end
 end