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

Merge pull request #2671 from mlorb/ml-fix-activities-filters

Browse source 
Fix activities filters
This commit is contained in:
mlorb 2020-06-19 11:42:24 +02:00 • committed by GitHub
commit 47aac74719
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/initializers/extends.rb
View file

@ -292,12 +292,12 @@ class Extends
ACTIVITY_GROUPS = {
projects: [*0..7, 32, 33, 34, 95, 108, 65, 109],
task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128],
task: [8, 58, 9, 59, 10, 11, 12, 13, 14, 35, 36, 37, 53, 54, *60..64, *66..69, 106, 126, 120, 132],
task: [8, 58, 9, 59, *10..14, 35, 36, 37, 53, 54, *60..63, 138, 139, 140, 64, *66..69, 106, 126, 120, 132],
task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 111, 45, 46, 47, 121, 124, 115, 118, 127, 130, 137],
task_inventory: [55, 56],
experiment: [*27..31, 57],
reports: [48, 50, 49],
inventories: [70, 71, 105, 72, 73, 74, 102, 75, 76, 77, 78, 96, 107, 113, 114, *133..136, 142, 143, 144, 145],
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,
83, 101, 112, 123, 125, 117, 119, 129, 131],
team: [92, 94, 93, 97, 104]

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

@ -234,6 +234,9 @@ en:
rename_task: "Task renamed"
move_task: "Task moved"
export_protocol_from_task: "Export protocol from task"
set_task_start_date: "Task start date set"
change_task_start_date: "Task start date changed"
remove_task_start_date: "Task start date removed"
set_task_due_date: "Task due date set"
change_task_due_date: "Task due date changed"
remove_task_due_date: "Task due date removed"
@ -241,6 +244,8 @@ en:
remove_task_tag: "Task tag removed"
create_inventory: "Inventory created"
rename_inventory: "Inventory renamed"
archive_inventory: "Inventory archived"
restore_inventory: "Inventory restored"
delete_inventory: "Inventory deleted"
share_inventory: "Inventory shared"
unshare_inventory: "Inventory unshared"
@ -251,6 +256,8 @@ en:
create_item_inventory: "Inventory item created"
edit_item_inventory: "Inventory item edited"
delete_item_inventory: "Inventory item deleted"
archive_inventory_item: "Inventory item archived"
restore_inventory_item: "Inventory item restored"
create_column_inventory: "Inventory column created"
edit_column_inventory: "Inventory column edited"
copy_inventory: "Inventory copied"