X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d2cf09f389b2b92aa2bc55f375573173a2bcf1a4..882700c5c8890ba28dc83a9dc526b7bc242a0278:/app/models/map_bug.rb

diff --git a/app/models/map_bug.rb b/app/models/map_bug.rb
index b07ef2941..2ae110bf2 100644
--- a/app/models/map_bug.rb
+++ b/app/models/map_bug.rb
@@ -1,36 +1,28 @@
 class MapBug < ActiveRecord::Base
   include GeoRecord
 
-  has_many :comments, :class_name => "MapBugComment", 
-                      :foreign_key => :bug_id, 
-                      :order => :date_created, 
-                      :conditions => "visible = true and comment is not null"
+  has_many :comments, :class_name => "MapBugComment",
+                      :foreign_key => :bug_id,
+                      :order => :created_at,
+                      :conditions => "visible = true AND body IS NOT NULL"
 
   validates_presence_of :id, :on => :update
   validates_uniqueness_of :id
   validates_numericality_of :latitude, :only_integer => true
   validates_numericality_of :longitude, :only_integer => true
-  validates_presence_of :date_created
-  validates_presence_of :last_changed
-  validates_presence_of :date_closed if :status == "closed"
+  validates_presence_of :closed_at if :status == "closed"
   validates_inclusion_of :status, :in => ["open", "closed", "hidden"]
 
   def self.create_bug(lat, lon)
-    bug = MapBug.new(:lat => lat, :lon => lon)
+    bug = MapBug.new(:lat => lat, :lon => lon, :status => "open")
     raise OSM::APIBadUserInput.new("The node is outside this world") unless bug.in_world?
 
-    bug.date_created = Time.now.getutc
-    bug.last_changed = Time.now.getutc
-    bug.status = "open"
-
     return bug
   end
 
   def close_bug
     self.status = "closed"
-    close_time = Time.now.getutc
-    self.last_changed = close_time
-    self.date_closed = close_time
+    self.closed_at = Time.now.getutc
 
     self.save
   end
@@ -39,12 +31,12 @@ class MapBug < ActiveRecord::Base
     resp = ""
     comment_no = 1
     self.comments.each do |comment|
-      next if upto_timestamp != :nil and comment.date_created > upto_timestamp
+      next if upto_timestamp != :nil and comment.created_at > upto_timestamp
       resp += (comment_no == 1 ? "" : separator_char)
-      resp += comment.comment if comment.comment
+      resp += comment.body if comment.body
       resp += " [ " 
-      resp += comment.commenter_name if comment.commenter_name
-      resp += " " + comment.date_created.to_s + " ]"
+      resp += comment.author_name if comment.author_name
+      resp += " " + comment.created_at.to_s + " ]"
       comment_no += 1
     end