maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove redundant user method from User Model (#7599)

Browse source
This commit is contained in:
Molly Struve 2020-04-30 04:03:10 -05:00 • committed by GitHub
parent e77f7854d5
commit 67a1109f6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/user.rb
View file

@ -330,11 +330,11 @@ class User < ApplicationRecord
end
def org_member?(organization)
OrganizationMembership.exists?(user: user, organization: organization, type_of_user: %w[admin member])
OrganizationMembership.exists?(user: self, organization: organization, type_of_user: %w[admin member])
end
def org_admin?(organization)
OrganizationMembership.exists?(user: user, organization: organization, type_of_user: "admin")
OrganizationMembership.exists?(user: self, organization: organization, type_of_user: "admin")
end
def block; end
@ -575,11 +575,6 @@ class User < ApplicationRecord
errors.add(:mastodon_url, "is not a valid URL")
end
# TODO: @practicaldev/sre: Remove this redundant method
def user
self
end
def tag_keywords_for_search
employer_name.to_s + mostly_work_with.to_s + available_for.to_s
end