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

Merge pull request #1648 from mlorb/ml-sci-3214

Browse source 
Remove activities that belong to addons [SCI-3214]
This commit is contained in:
mlorb 2019-04-08 11:48:55 +02:00 committed by GitHub
commit f566dd6c83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
config/initializers/extends.rb
View file

@ -173,10 +173,7 @@ class Extends
remove_task_due_date: 63, remove_task_due_date: 63,
add_task_tag: 64, add_task_tag: 64,
edit_task_tag: 65, edit_task_tag: 65,
remove_task_tag: 66, remove_task_tag: 66, # 67, 68, 69 are in addons
sign_and_lock_task: 67,
cosign_and_lock_task: 68,
unlock_task: 69,
create_inventory: 70, create_inventory: 70,
rename_inventory: 71, rename_inventory: 71,
delete_inventory: 72, delete_inventory: 72,
@ -203,18 +200,16 @@ class Extends
remove_user_from_team: 93, remove_user_from_team: 93,
change_users_role_on_team: 94, change_users_role_on_team: 94,
export_projects: 95, export_projects: 95,
export_inventory_items: 96, export_inventory_items: 96, # 97 is in addon
export_audit_trails: 97,
export_system_logs: 98,
edit_wopi_file_on_result: 99, edit_wopi_file_on_result: 99,
edit_wopi_file_on_step: 100, edit_wopi_file_on_step: 100,
edit_wopi_file_on_step_in_repository: 101,
copy_inventory_item: 102,
copy_protocol_in_repository: 103, copy_protocol_in_repository: 103,
user_leave_team: 104, user_leave_team: 104,
export_protocol_from_task: 106,
edit_wopi_file_on_step_in_repository: 101,
copy_inventory: 105, copy_inventory: 105,
copy_inventory_item: 102 export_protocol_from_task: 106
}.freeze }
ACTIVITY_GROUPS = { ACTIVITY_GROUPS = {
projects: [*0..7, 32, 33, 34], projects: [*0..7, 32, 33, 34],
@ -226,7 +221,6 @@ class Extends
reports: [48, 49, 50], reports: [48, 49, 50],
inventories: [*70..78, 105, 102], inventories: [*70..78, 105, 102],
protocol_repository: [*79..91, 101, 103], protocol_repository: [*79..91, 101, 103],
team: [*92..96, 104], team: [*92..97, 104]
exports: [*97..98]
}.freeze }.freeze
end end

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

@ -198,9 +198,6 @@ en:
add_task_tag: "Task tag added" add_task_tag: "Task tag added"
edit_task_tag: "Task tag edited" edit_task_tag: "Task tag edited"
remove_task_tag: "Task tag removed" remove_task_tag: "Task tag removed"
sign_and_lock_task: "Task signed and locked"
cosign_and_lock_task: "Task co-signed and locked"
unlock_task: "Task unlocked"
create_inventory: "Inventory created" create_inventory: "Inventory created"
rename_inventory: "Inventory renamed" rename_inventory: "Inventory renamed"
delete_inventory: "Inventory deleted" delete_inventory: "Inventory deleted"
@ -232,8 +229,6 @@ en:
user_leave_team: "User left team" user_leave_team: "User left team"
export_projects: "Projects exported" export_projects: "Projects exported"
export_inventory_items: "Inventory items exported" export_inventory_items: "Inventory items exported"
export_audit_trails: "Audit trails exported"
export_system_logs: "System logs exported"
activity_group: activity_group:
projects: "Projects" projects: "Projects"
task_results: "Task results" task_results: "Task results"