Merge pull request #18 from differentreality/stats

Stats
2013-07-12 04:43:23 -07:00 · 2013-07-12 04:43:23 -07:00 · 83b20dfc58
commit 83b20dfc58
parent 841f02b7db e59dbb0208
6 changed files with 227 additions and 0 deletions
--- a/app/models/person.rb
+++ b/app/models/person.rb
@ -20,6 +20,9 @@ class Person < ActiveRecord::Base
                    :styles => {:tiny => "16x16>", :small => "32x32>", :large => "128x128>"},
                    :default_url => "person_:style.png"
  validates_attachment_content_type :avatar, :content_type => [/jpg/, /jpeg/, /png/, /gif/]
+
+  alias_attribute :affiliation, :company
+
  def to_s
    if self.public_name.empty?
      self.first_name + " " + self.last_name