X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/563871c5a9a8140522b0c569df5c91a38528c8ce..1c88a0b136de0d7bf43b66912b618e3e9e83db91:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index ceeefd40f..6b5418256 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -15,7 +15,6 @@ # pass_salt :string # email_valid :boolean default(FALSE), not null # new_email :string -# creation_ip :string # languages :string # status :enum default("pending"), not null # terms_agreed :datetime @@ -33,9 +32,11 @@ # tou_agreed :datetime # diary_comments_count :integer default(0) # note_comments_count :integer default(0) +# creation_address :inet # # Indexes # +# index_users_on_creation_address (creation_address) USING gist # users_auth_idx (auth_provider,auth_uid) UNIQUE # users_display_name_canonical_idx (lower(NORMALIZE(display_name, NFKC))) # users_display_name_idx (display_name) UNIQUE @@ -48,6 +49,8 @@ class User < ApplicationRecord require "digest" include AASM + self.ignored_columns += ["creation_ip"] + has_many :traces, -> { where(:visible => true) } has_many :diary_entries, -> { order(:created_at => :desc) }, :inverse_of => :user has_many :diary_comments, -> { order(:created_at => :desc) }, :inverse_of => :user