Mercurial > hg > soundsoftware-site
diff app/models/user.rb @ 689:a8e402f48723 cannam
Merge from branch "live"
author | Chris Cannam |
---|---|
date | Fri, 16 Sep 2011 15:51:18 +0100 |
parents | ec7c78040115 |
children | 5e80956cc792 |
line wrap: on
line diff
--- a/app/models/user.rb Fri Sep 09 13:20:34 2011 +0100 +++ b/app/models/user.rb Fri Sep 16 15:51:18 2011 +0100 @@ -54,6 +54,8 @@ has_one :ssamr_user_detail, :dependent => :destroy, :class_name => 'SsamrUserDetail' accepts_nested_attributes_for :ssamr_user_detail + + has_one :author # Active non-anonymous users scope named_scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}"