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

Merge pull request #8769 from artoscinote/ma_SCI_12223

Browse source 
Access activity fixes for PET [SCI-12223]
This commit is contained in:
Martin Artnik 2025-08-11 13:48:38 +02:00 • committed by GitHub
commit 3ecd8b5765
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/access_permissions/base_controller.rb
View file

@ -122,7 +122,7 @@ module AccessPermissions
private
def model_parameter
@model.class.permission_class.name.parameterize.to_sym
@model.model_name.param_key
end
def manage_permission_constant

2
app/controllers/access_permissions/experiments_controller.rb
View file

@ -27,6 +27,8 @@ module AccessPermissions
UserAssignments::PropagateAssignmentJob.perform_later(@assignment)
case assignment_type
when :team
log_activity(:experiment_access_changed_all_team_members, team: @assignment.team.id, role: @assignment.user_role.name)
when :user_group
log_activity(:experiment_access_changed_user_group, user_group: @assignment.user_group.id, role: @assignment.user_role.name)
when :user

2
app/controllers/access_permissions/my_modules_controller.rb
View file

@ -26,6 +26,8 @@ module AccessPermissions
end
case assignment_type
when :team
log_activity(:my_module_access_changed_all_team_members, team: @assignment.team.id, role: @assignment.user_role.name)
when :user_group
log_activity(:my_module_access_changed_user_group, user_group: @assignment.user_group.id, role: @assignment.user_role.name)
when :user

8
config/initializers/extends.rb
View file

@ -619,18 +619,20 @@ class Extends
repository_access_revoked_all_team_members: 402,
repository_access_granted_user_group: 403,
repository_access_changed_user_group: 404,
repository_access_revoked_user_group: 405
repository_access_revoked_user_group: 405,
experiment_access_changed_all_team_members: 406,
my_module_access_changed_all_team_members: 407
}
ACTIVITY_GROUPS = {
projects: [*0..7, 32, 33, 34, 95, 108, 65, 109, *158..162, 241, 242, 243, *370..378, *390..392],
task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128, *246..248, *257..273, *284..291, 301, 303, 306, 328],
task: [8, 58, 9, 59, *10..14, 35, 36, 37, 53, 54, *60..63, 138, 139, 140, 64, 66, 106, 126, 120, 132,
148, 166, 394, 395, 396],
148, 166, 394, 395, 396, 407],
task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 111, 45, 46, 47, 121, 124, 115, 118, 127, 130, 137,
184, 185, 188, 189, *192..203, 221, 222, 224, 225, 226, 236, *249..252, *274..278, 299, 302, 305, 327, *347..352, 359],
task_inventory: [55, 56, 146, 147, 183],
experiment: [*27..31, 57, 141, 165, *363..369, 393],
experiment: [*27..31, 57, 141, 165, *363..369, 393, 406],
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, 180, 181, 182, *292..298, 308, 329, *397..405],

11
config/locales/global_activities/en.yml
View file

@ -418,9 +418,12 @@ en:
repository_access_granted_all_team_members_html: "%{user} granted access to all team members of %{team} team with user role %{role} to inventory %{repository}."
repository_access_changed_all_team_members_html: "%{user} changed %{team}’s role on inventory %{repository} to %{role}."
repository_access_revoked_all_team_members_html: "%{user} removed %{team} team members with user role %{role} from inventory %{repository}."
repository_access_granted_user_group_html: "%{user} granted access to %{user_group} with user role %{role} to inventory template %{repository}."
repository_access_changed_user_group_html: "%{user} changed %{user_group}'s role on inventory template %{repository} to %{role}."
repository_access_revoked_user_group_html: "%{user} removed group %{user_group} with user role %{role} from inventory template %{repository}."
repository_access_granted_user_group_html: "%{user} granted access to %{user_group} with user role %{role} to inventory %{repository}."
repository_access_changed_user_group_html: "%{user} changed %{user_group}'s role on inventory %{repository} to %{role}."
repository_access_revoked_user_group_html: "%{user} removed group %{user_group} with user role %{role} from inventory %{repository}."
experiment_access_changed_all_team_members_html: "%{user} changed %{team}'s role on experiment %{experiment} to %{role}."
my_module_access_changed_all_team_members_html: "%{user} changed %{team}'s role on task %{my_module} to %{role}."
activity_name:
create_project: "Project created"
edit_project: "Project edited"
@ -797,6 +800,8 @@ en:
repository_access_granted_user_group: "Grant access to group"
repository_access_changed_user_group: "Change role of group"
repository_access_revoked_user_group: "Remove access to group"
experiment_access_changed_all_team_members: "Change role of all team members"
my_module_access_changed_all_team_members: "Change role of all team members"
activity_group:
projects: "Projects"
task_results: "Task results"