Mercurial > hg > soundsoftware-site

comparison app/models/user.rb @ 689:a8e402f48723 cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "live"
author Chris Cannam
date Fri, 16 Sep 2011 15:51:18 +0100
parents ec7c78040115
children 5e80956cc792
comparison
equal deleted inserted replaced
648:7fc15203288c 689:a8e402f48723
52 has_one :api_token, :class_name => 'Token', :conditions => "action='api'" 52 has_one :api_token, :class_name => 'Token', :conditions => "action='api'"
53 belongs_to :auth_source 53 belongs_to :auth_source
54 54
55 has_one :ssamr_user_detail, :dependent => :destroy, :class_name => 'SsamrUserDetail' 55 has_one :ssamr_user_detail, :dependent => :destroy, :class_name => 'SsamrUserDetail'
56 accepts_nested_attributes_for :ssamr_user_detail 56 accepts_nested_attributes_for :ssamr_user_detail
57
58 has_one :author
57 59
58 # Active non-anonymous users scope 60 # Active non-anonymous users scope
59 named_scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}" 61 named_scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}"
60 62
61 acts_as_customizable 63 acts_as_customizable