scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-04-01 18:02:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix activities for assigning to experiments and tasks [SCI-6254]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2021-11-11 21:30:30 +01:00
parent eb8de58c97
commit f73f9dd2c1
3 changed files with 5 additions and 4 deletions
app
models
activity.rb
permissions
experiment.rb
config/initializers
extends.rb

2
app/models/activity.rb
View file

@ -10,6 +10,8 @@ class Activity < ApplicationRecord
invite_user_to_team
remove_user_from_team
change_users_role_on_team
change_user_role_on_experiment
change_user_role_on_my_module
).freeze
include ActivityValuesModel

3
app/permissions/experiment.rb
View file

@ -5,8 +5,7 @@ Canaid::Permissions.register_for(Experiment) do
manage_experiment_users
archive_experiment
clone_experiment
move_experiment
manage_experiment_access)
move_experiment)
.each do |perm|
can perm do |_, experiment|
experiment.active? &&

4
config/initializers/extends.rb
View file

@ -329,11 +329,11 @@ class Extends
projects: [*0..7, 32, 33, 34, 95, 108, 65, 109, *158..162],
task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128, 169, 172, 178],
task: [8, 58, 9, 59, *10..14, 35, 36, 37, 53, 54, *60..63, 138, 139, 140, 64, 66, 106, 126, 120, 132,
*146..148],
*146..148, 166],
task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 111, 45, 46, 47, 121, 124, 115, 118, 127, 130, 137,
168, 171, 177],
task_inventory: [55, 56, 146, 147],
experiment: [*27..31, 57, 141],
experiment: [*27..31, 57, 141, 165],
reports: [48, 50, 49, 163, 164],
inventories: [70, 71, 105, 144, 145, 72, 73, 74, 102, 142, 143, 75, 76, 77, 78, 96, 107, 113, 114, *133..136],
protocol_repository: [80, 103, 89, 87, 79, 90, 91, 88, 85, 86, 84, 81, 82,