Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 'New Permission Form' project dropdown should show projects for which the user is either an admin or a researcher #1277

Merged
merged 1 commit into from
Apr 9, 2024
Merged

feat: 'New Permission Form' project dropdown should show projects for which the user is either an admin or a researcher #1277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rails/app/policies/admin/project_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ class Scope < Scope
def resolve
if user.has_role?('admin')
all
elsif user.is_project_admin?
user.admin_for_projects
elsif user.is_project_researcher?
user.researcher_for_projects
elsif user.is_project_admin? || user.is_project_researcher?
admin_project_ids = user.admin_for_projects.select(:id)
researcher_project_ids = user.researcher_for_projects.select(:id)
scope.where(id: admin_project_ids).or(scope.where(id: researcher_project_ids))
else
none
end
Expand Down
Loading