scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-31 04:32:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2954 from aignatov-bio/ai-sci-5182-add-activity-for-project-moving

Browse source 
Add activity for project moving [SCI-5182]
This commit is contained in:
Alex Kriuchykhin 2020-11-27 09:47:49 +01:00 committed by GitHub
commit b45692ab1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config/initializers/extends.rb
View file

@ -145,10 +145,10 @@ class Extends
ACTIVITY_MESSAGE_ITEMS_TYPES =
ACTIVITY_SUBJECT_TYPES + %w(
User Tag RepositoryColumn RepositoryRow Step Asset TinyMceAsset Repository MyModuleStatus RepositorySnapshot
User Tag RepositoryColumn RepositoryRow Step Asset TinyMceAsset
Repository MyModuleStatus RepositorySnapshot ProjectFolder
).freeze
ACTIVITY_TYPES = {
create_project: 0,
rename_project: 1,
@ -292,11 +292,12 @@ class Extends
restore_inventory: 145,
export_inventory_items_assigned_to_task: 146,
export_inventory_snapshot_items_assigned_to_task: 147,
change_status_on_task_flow: 148 # 149, 150, 151 in AdddOn!
change_status_on_task_flow: 148, # 149, 150, 151 in AdddOn!
move_project: 158
}
ACTIVITY_GROUPS = {
projects: [*0..7, 32, 33, 34, 95, 108, 65, 109],
projects: [*0..7, 32, 33, 34, 95, 108, 65, 109, 158],
task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128],
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],

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

@ -176,6 +176,7 @@ en:
export_inventory_items_assigned_to_task_html: "%{user} exported inventory item(s) assigned to task %{my_module} from inventory %{repository}: Live version."
export_inventory_snapshot_items_assigned_to_task_html: "%{user} exported inventory item(s) assigned to task %{my_module} from inventory %{repository_snapshot}: Snapshot of %{created_at}."
change_status_on_task_flow_html: "%{user} changed status from <strong>%{my_module_status_old}</strong> to <strong>%{my_module_status_new}</strong> for task %{my_module}."
move_project_html: "%{user} moved %{project} project to <strong>%{project_folder_dest}</strong> folder from <strong>%{project_folder_src}</strong> folder"
activity_name:
create_project: "Project created"
@ -317,6 +318,7 @@ en:
export_inventory_items_assigned_to_task: "Task-assigned inventory items exported (live version)"
export_inventory_snapshot_items_assigned_to_task: "Task-assigned inventory items exported (snapshot)"
change_status_on_task_flow: "Task status changed"
move_project: "Project moved"
activity_group:
projects: "Projects"