Mercurial > hg > soundsoftware-site
comparison app/models/user.rb @ 403:b15397a5341c feature_36
model changes;
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Tue, 12 Apr 2011 16:35:30 +0100 |
parents | 440c4f4bf2d6 |
children | ec7c78040115 |
comparison
equal
deleted
inserted
replaced
402:ef8a9bc67e15 | 403:b15397a5341c |
---|---|
51 has_one :api_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='api'" | 51 has_one :api_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='api'" |
52 belongs_to :auth_source | 52 belongs_to :auth_source |
53 | 53 |
54 has_one :ssamr_user_detail, :dependent => :destroy, :class_name => 'SsamrUserDetail' | 54 has_one :ssamr_user_detail, :dependent => :destroy, :class_name => 'SsamrUserDetail' |
55 accepts_nested_attributes_for :ssamr_user_detail | 55 accepts_nested_attributes_for :ssamr_user_detail |
56 | |
57 has_one :author | |
56 | 58 |
57 # Active non-anonymous users scope | 59 # Active non-anonymous users scope |
58 named_scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}" | 60 named_scope :active, :conditions => "#{User.table_name}.status = #{STATUS_ACTIVE}" |
59 | 61 |
60 acts_as_customizable | 62 acts_as_customizable |