scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

add read check to view methods

Browse source
This commit is contained in:
zmagoD 2021-06-20 11:11:03 +02:00
parent ad10befcc4
commit 9b87fce840
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/experiment.rb
View file

@ -101,7 +101,9 @@ class Experiment < ApplicationRecord
end
def self.viewable_by_user(user, teams)
where(project: Project.viewable_by_user(user, teams))
left_outer_joins(user_assignments: :user_role)
.where(project: Project.viewable_by_user(user, teams))
.where('user_roles.permissions @> ARRAY[?]::varchar[]', %w[experiment_read])
end
def archived_branch?

4
app/models/my_module.rb
View file

@ -132,7 +132,9 @@ class MyModule < ApplicationRecord
end
def self.viewable_by_user(user, teams)
where(experiment: Experiment.viewable_by_user(user, teams))
left_outer_joins(user_assignments: :user_role)
.where(experiment: Experiment.viewable_by_user(user, teams))
.where('user_roles.permissions @> ARRAY[?]::varchar[]', %w[task_read])
end
def navigable?

3
app/models/project.rb
View file

@ -153,11 +153,12 @@ class Project < ApplicationRecord
# If project is visible everyone from the team can view it
Project.where(team: teams)
.left_outer_joins(team: :user_teams)
.left_outer_joins(:user_assignments)
.left_outer_joins(user_assignments: :user_role)
.where('projects.visibility = 1 OR '\
'user_assignments.user_id = :user_id OR '\
'(user_teams.user_id = :user_id AND user_teams.role = 2)',
user_id: user.id)
.where('user_roles.permissions @> ARRAY[?]::varchar[]', %w[project_read])
.distinct
end