Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/map_bug_comment.rb b/app/models/map_bug_comment.rb
index 9839cae45af5da54f7cebff72fe30e9a13756678..166e3fb42927f2308a025751c4dbb62a61681abf 100644 (file)
--- a/app/models/map_bug_comment.rb
+++ b/app/models/map_bug_comment.rb
@@ -3,8 +3,9 @@ class MapBugComment < ActiveRecord::Base
   set_table_name 'map_bug_comment'
 
   belongs_to :map_bug, :foreign_key => 'bug_id'
   set_table_name 'map_bug_comment'
 
   belongs_to :map_bug, :foreign_key => 'bug_id'

-  
-  
+  belongs_to :user, :foreign_key => 'commenter_id'
+
+   validates_inclusion_of :event, :in => [ "opened", "closed", "reopened", "commented", "hidden" ]

 
   validates_presence_of :id, :on => :update
   validates_uniqueness_of :id
 
   validates_presence_of :id, :on => :update
   validates_uniqueness_of :id