X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0caaf54de5b85070548381a814106a07f366b11a..f77a3c75bee528caaa6fc8e237ee6eaef704efe0:/app/models/map_bug.rb

diff --git a/app/models/map_bug.rb b/app/models/map_bug.rb
index 0effe38dd..7094bfe5e 100644
--- a/app/models/map_bug.rb
+++ b/app/models/map_bug.rb
@@ -1,57 +1,65 @@
 class MapBug < ActiveRecord::Base
   include GeoRecord
 
-  set_table_name 'map_bugs'
+  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_prensence_of :date_closed if :status == "closed"
-  validates_inclusion_of :status, :in => [ "open", "closed", "hidden" ]
-
-  has_many :map_bug_comment, :foreign_key => :bug_id, :order => :date_created, :conditions => "visible = true and comment is not null"
-
+  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);
-	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;
+    bug = MapBug.new(:lat => lat, :lon => lon, :status => "open")
+    raise OSM::APIBadUserInput.new("The node is outside this world") unless bug.in_world?
+
+    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.status = "closed"
+    self.closed_at = Time.now.getutc
 
-	self.save;
+    self.save
   end
 
-  def flatten_comment ( separator_char, upto_timestamp = :nil)
-	resp = ""
-	comment_no = 1
-	self.map_bug_comment.each do |comment|
-	  next if upto_timestamp != :nil and comment.date_created > upto_timestamp
-        resp += (comment_no == 1 ? "" : separator_char)
-		resp += comment.comment if comment.comment
-		resp += " [ " 
-		resp += comment.commenter_name if comment.commenter_name
-		resp += " " + comment.date_created.to_s + " ]"
-		comment_no += 1
-	end
-
-	return resp
+  def flatten_comment(separator_char, upto_timestamp = :nil)
+    resp = ""
+    comment_no = 1
+    self.comments.each do |comment|
+      next if upto_timestamp != :nil and comment.created_at > upto_timestamp
+      resp += (comment_no == 1 ? "" : separator_char)
+      resp += comment.body if comment.body
+      resp += " [ " 
+      resp += comment.author_name if comment.author_name
+      resp += " " + comment.created_at.to_s + " ]"
+      comment_no += 1
+    end
 
+    return resp
   end
 
   def visible
-	return status != "hidden"
+    return status != "hidden"
+  end
+
+  def author
+    self.comments.first.author
   end
 
+  def author_ip
+    self.comments.first.author_ip
+  end
+
+  def author_id
+    self.comments.first.author_id
+  end
+
+  def author_name
+    self.comments.first.author_name
+  end
 end