app/models/openstax/accounts/group.rb in openstax_accounts-7.0.1 vs app/models/openstax/accounts/group.rb in openstax_accounts-7.1.0
- old
+ new
@@ -43,15 +43,21 @@
(group_owners.user_id.eq my{account.id}))}
}
def has_owner?(account)
return false unless account.is_a? OpenStax::Accounts::Account
- !group_owners.where(user_id: account.id).first.nil?
+
+ gos = group_owners
+ gos = gos.preload(:user) if persisted?
+ gos.any?{ |go| go.user == account }
end
def has_direct_member?(account)
return false unless account.is_a? OpenStax::Accounts::Account
- !group_members.where(user_id: account.id).first.nil?
+
+ gms = group_members
+ gms = gms.preload(:user) if persisted?
+ gms.any?{ |gm| gm.user == account }
end
def has_member?(account)
return false unless account.is_a? OpenStax::Accounts::Account
!account.group_members.where(group_id: subtree_group_ids).first.nil?