From 67a1109f6bf1a8f667e39e34d06a69c5efc1fa4a Mon Sep 17 00:00:00 2001 From: Molly Struve Date: Thu, 30 Apr 2020 04:03:10 -0500 Subject: [PATCH] Remove redundant user method from User Model (#7599) --- app/models/user.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index dea6b05c1..0ab1a25f5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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