Record time of closure of a bug.

[rails.git] / app / models / map_bug.rb

diff --git a/app/models/map_bug.rb b/app/models/map_bug.rb
index 61c9f145f5aff0b2c37c73b009cf90d873cc7009..18e6ab2707efbf72e68984a8fe950c6cc4fa5f96 100644 (file)
--- a/app/models/map_bug.rb
+++ b/app/models/map_bug.rb
@@ -9,24 +9,44 @@ class MapBug < ActiveRecord::Base
   validates_numericality_of :longitude, :only_integer => true
   validates_presence_of :date_created
   validates_presence_of :last_changed
   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" ]
 
   validates_inclusion_of :status, :in => [ "open", "closed", "hidden" ]
 

+  has_many :map_bug_comment, :foreign_key => :bug_id, :order => :date_created, :conditions => { :visible => true } 

 
 

-  def self.create_bug(lat, lon, comment)
+
+  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 = MapBug.new(:lat => lat, :lon => lon);
        raise OSM::APIBadUserInput.new("The node is outside this world") unless bug.in_world?

-       bug.text = comment

        bug.date_created = Time.now.getutc
        bug.last_changed = Time.now.getutc
        bug.status = "open";
        bug.date_created = Time.now.getutc
        bug.last_changed = Time.now.getutc
        bug.status = "open";

-       bug.save;

        return bug;
   end
 
   def close_bug
        self.status = "closed"
        return bug;
   end
 
   def close_bug
        self.status = "closed"

-       self.last_changed = Time.now.getutc
+       close_time = Time.now.getutc
+       self.last_changed = close_time
+       self.date_closed = close_time
+

        self.save;
   end
 
        self.save;
   end
 

+  def flatten_comment ( separator_char )
+       resp = ""
+       comment_no = 1
+       self.map_bug_comment.each do |comment|
+        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
+
+  end
+

 end
 end