From: Tom Hughes <tom@compton.nu>
Date: Sat, 7 May 2011 16:47:05 +0000 (+0100)
Subject: Always get the bug commenter name from the user if there is one
X-Git-Tag: live~5068^2~173
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/63e9c4771a02ecf69a692df3a6df3d236b0c214b

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

diff --git a/app/models/map_bug_comment.rb b/app/models/map_bug_comment.rb
index 3b95b1fff..50bfe3bef 100644
--- a/app/models/map_bug_comment.rb
+++ b/app/models/map_bug_comment.rb
@@ -9,4 +9,12 @@ class MapBugComment < ActiveRecord::Base
   validates_uniqueness_of :id
   validates_presence_of :visible
   validates_presence_of :date_created
+
+  def commenter_name
+    if self.commenter_id.nil?
+      self.read_attribute(:commenter_name)
+    else
+      self.user.display_name
+    end
+  end
 end
diff --git a/app/views/map_bugs/_bug.xml.builder b/app/views/map_bugs/_bug.xml.builder
index 69683b7dd..a25a588a2 100644
--- a/app/views/map_bugs/_bug.xml.builder
+++ b/app/views/map_bugs/_bug.xml.builder
@@ -12,14 +12,8 @@ xml.bug("lon" => bug.lon, "lat" => bug.lat) do
     bug.map_bug_comment.each do |comment|
       xml.comment do
         xml.date comment.date_created
-
-        unless comment.commenter_id.nil?
-          xml.uid comment.commenter_id
-          xml.user comment.user.display_name	
-        else
-          xml.user comment.commenter_name
-        end
-
+        xml.uid comment.commenter_id unless comment.commenter_id.nil?
+        xml.user comment.commenter_name
         xml.text comment.comment
       end	
     end
diff --git a/app/views/map_bugs/rss.rss.builder b/app/views/map_bugs/rss.rss.builder
index f5b597dd7..ced183a10 100644
--- a/app/views/map_bugs/rss.rss.builder
+++ b/app/views/map_bugs/rss.rss.builder
@@ -35,13 +35,7 @@ xml.rss("version" => "2.0",
         description_text += comment.map_bug.flatten_comment("<br>", 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.author comment.commenter_name
         xml.pubDate comment.date_created.to_s(:rfc822)
         xml.geo :lat, comment.map_bug.lat
         xml.geo :long, comment.map_bug.lon