scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-13 08:34:49 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6101 from okriuchykhin/ok_SCI_9148

Browse source 
Hide from annotations projects where user is not assigned [SCI-9148]
This commit is contained in:
Alex Kriuchykhin 2023-09-14 10:57:34 +02:00 • committed by GitHub
commit d08c2d8bb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/models/project.rb
View file

@ -64,8 +64,12 @@ class Project < ApplicationRecord
reject_if: :all_blank
scope :visible_to, (lambda do |user, team|
unless team.permission_granted?(user, TeamPermissions::MANAGE)
left_outer_joins(user_assignments: :user_role)
# Team owners see all projects in the team
if team.permission_granted?(user, TeamPermissions::MANAGE)
where(team: team)
else
where(team: team)
.left_outer_joins(user_assignments: :user_role)
.where(user_assignments: { user: user })
.where('? = ANY(user_roles.permissions)', ProjectPermissions::READ)
end
@ -98,15 +102,10 @@ class Project < ApplicationRecord
end
def self.viewable_by_user(user, teams)
# Team owners see all projects in the team
owner_role = UserRole.find_predefined_owner_role
projects = Project.left_outer_joins(:team, user_assignments: :user_role)
.joins("LEFT OUTER JOIN user_assignments team_user_assignments " \
"ON team_user_assignments.assignable_type = 'Team' " \
"AND team_user_assignments.assignable_id = team.id")
.where(team: teams)
projects.where(team: { team_user_assignments: { user_id: user, user_role_id: owner_role } })
.or(projects.with_granted_permissions(user, ProjectPermissions::READ)).distinct
joins(user_assignments: :user_role)
.where(team: teams)
.with_granted_permissions(user, ProjectPermissions::READ)
.distinct
end
def self.with_children_viewable_by_user(user)

2
app/services/smart_annotations/tag_to_html.rb
View file

@ -61,7 +61,7 @@ module SmartAnnotations
klass = OBJECT_MAPPINGS.fetch(type.to_sym) do
raise ActiveRecord::RecordNotFound.new("#{type} does not exist")
end
klass.find_by_id(id)
klass.find_by(id: id)
end
end
end