app/models/profile.rb in enju_seed-0.3.0.beta.2 vs app/models/profile.rb in enju_seed-0.3.0.beta.3

- old
+ new

@@ -1,11 +1,11 @@ class Profile < ActiveRecord::Base enju_search_log_profile_model if defined?(EnjuSearchLog) scope :administrators, -> { joins(user: :role).where('roles.name = ?', 'Administrator') } scope :librarians, -> { joins(user: :role).where('roles.name = ? OR roles.name = ?', 'Administrator', 'Librarian') } - belongs_to :user, dependent: :destroy + has_one :user belongs_to :library, validate: true belongs_to :user_group belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id' # , validate: true has_many :identities has_many :agents @@ -13,11 +13,10 @@ validates_associated :user_group, :library validates_associated :user validates :user_group, :library, :locale, presence: true # , :user_number validates :user_number, uniqueness: true, format: { with: /\A[0-9A-Za-z_]+\z/ }, allow_blank: true - validates :user_id, uniqueness: true, allow_blank: true validates :birth_date, format: { with: /\A\d{4}-\d{1,2}-\d{1,2}\z/ }, allow_blank: true strip_attributes only: :user_number attr_accessor :birth_date @@ -77,21 +76,20 @@ # == Schema Information # # Table name: profiles # -# id :integer not null, primary key -# user_id :integer -# user_group_id :integer -# library_id :integer +# id :uuid not null, primary key +# user_group_id :uuid +# library_id :uuid # locale :string # user_number :string # full_name :text # note :text # keyword_list :text # required_role_id :integer -# created_at :datetime -# updated_at :datetime +# created_at :datetime not null +# updated_at :datetime not null # checkout_icalendar_token :string # save_checkout_history :boolean default(FALSE), not null # expired_at :datetime # full_name_transcription :text # date_of_birth :datetime