Merge branch 'master' of github.com:OWASP/railsgoat into top-10-2013

app/models/message.rb

@@ -0,0 +1,10 @@
+class Message < ActiveRecord::Base
+  belongs_to :user
+  attr_accessible :creator_id, :message, :read, :receiver_id
+  validates_presence_of :creator_id, :receiver_id, :message
+
+  def creator_name
+    creator = User.where(:id => self.creator_id).first
+    creator.full_name
+  end
+end

app/models/user.rb

@@ -17,7 +17,7 @@ class User < ActiveRecord::Base
   has_one :paid_time_off, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy
   has_one :work_info, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy
   has_many :performance, :foreign_key => :user_id, :primary_key => :user_id, :dependent => :destroy
-
+  has_many :messages, :foreign_key => :receiver_id, :primary_key => :user_id, :dependent => :destroy
 
 
   def build_benefits_data
@@ -26,13 +26,13 @@ class User < ActiveRecord::Base
     build_work_info(POPULATE_WORK_INFO.shuffle.first)
     performance.build(POPULATE_PERFORMANCE.shuffle.first)
   end
-
-  private
   
   def full_name
     "#{self.first_name} #{self.last_name}"
   end
 
+private
+
   def self.authenticate(email, password)
        auth = nil
        user = find_by_email(email)