scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-25 01:03:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix permissions checks in recent work service [SCI-6253] (#3654)

Browse source
This commit is contained in:
Alex Kriuchykhin 2021-11-12 11:13:43 +01:00 committed by GitHub
parent b73cd5c31e
commit 1c3a2aa0a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/services/dashboard/recent_work_service.rb
View file

@ -22,17 +22,23 @@ module Dashboard
all_activities = join_step_user_roles(all_activities)
team_activities = all_activities.where(subject_type: %w(Team RepositoryBase ProjectFolder))
project_activities = all_activities.where('project_user_roles.permissions @> ARRAY[?]::varchar[]',
project_activities = all_activities.where(project_user_assignments: { user_id: @user.id })
.where('project_user_roles.permissions @> ARRAY[?]::varchar[]',
[ProjectPermissions::ACTIVITIES_READ])
experiment_activities = all_activities.where('experiment_user_roles.permissions @> ARRAY[?]::varchar[]',
experiment_activities = all_activities.where(experiment_user_assignments: { user_id: @user.id })
.where('experiment_user_roles.permissions @> ARRAY[?]::varchar[]',
[ExperimentPermissions::ACTIVITIES_READ])
my_module_activities = all_activities.where('my_module_user_roles.permissions @> ARRAY[?]::varchar[]',
my_module_activities = all_activities.where(my_module_user_assignments: { user_id: @user.id })
.where('my_module_user_roles.permissions @> ARRAY[?]::varchar[]',
[MyModulePermissions::ACTIVITIES_READ])
result_activities = all_activities.where('result_my_module_user_roles.permissions @> ARRAY[?]::varchar[]',
result_activities = all_activities.where(result_my_module_user_assignments: { user_id: @user.id })
.where('result_my_module_user_roles.permissions @> ARRAY[?]::varchar[]',
[MyModulePermissions::ACTIVITIES_READ])
protocol_activities = all_activities.where('protocol_my_module_user_roles.permissions @> ARRAY[?]::varchar[]',
protocol_activities = all_activities.where(protocol_my_module_user_assignments: { user_id: @user.id })
.where('protocol_my_module_user_roles.permissions @> ARRAY[?]::varchar[]',
[MyModulePermissions::ACTIVITIES_READ])
step_activities = all_activities.where('protocol_my_module_user_roles.permissions @> ARRAY[?]::varchar[]',
step_activities = all_activities.where(step_my_module_user_assignments: { user_id: @user.id })
.where('step_my_module_user_roles.permissions @> ARRAY[?]::varchar[]',
[MyModulePermissions::ACTIVITIES_READ])
activities = team_activities.or(project_activities)