aas/additionals
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some cleanups

Browse Source
This commit is contained in:
Alexander Meindl 2020-08-03 18:31:48 +02:00
parent 65a6b4b9e8
commit fe0ac905b4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/additionals/patches/user_patch.rb
View File

@ -21,7 +21,6 @@ module Additionals
member_scope = Member.joins(:member_roles)
.joins(:project)
.active
.where(projects: { status: Project::STATUS_ACTIVE })
.where(user_id: all.ids)
.where(member_roles: { role_id: role_ids })
@ -31,8 +30,8 @@ module Additionals
user_ids = member_scope.pluck(:user_id) | admin_ids
where(id: user_ids)
else
member_ids = member_scope.where(project_id: project).pluck(:user_id)
where(id: member_ids).or(where(id: admin_ids))
user_ids = member_scope.where(project_id: project).pluck(:user_id)
where(id: user_ids).or(where(id: admin_ids))
end
end
end