From 68284c10da0c953fe42ad2e095758e7831ba7c91 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 27 Nov 2019 14:37:53 +0100 Subject: [PATCH] Add task description and task protocol description activities --- app/controllers/my_modules_controller.rb | 2 ++ config/initializers/extends.rb | 5 +++-- config/locales/global_activities/en.yml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index d529eb37e..0a6b3f4ac 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -238,6 +238,7 @@ class MyModulesController < ApplicationController respond_to do |format| format.json do if @my_module.update(description: params.require(:my_module)[:description]) + log_activity(:change_module_description) TinyMceAsset.update_images(@my_module, params[:tiny_mce_images], current_user) render json: { html: custom_auto_link( @@ -260,6 +261,7 @@ class MyModulesController < ApplicationController respond_to do |format| format.json do if protocol.update(description: params.require(:protocol)[:description]) + log_activity(:protocol_description_in_task_edited) TinyMceAsset.update_images(protocol, params[:tiny_mce_images], current_user) render json: { html: custom_auto_link( diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb index 891ed0f06..98010eeaa 100644 --- a/config/initializers/extends.rb +++ b/config/initializers/extends.rb @@ -246,14 +246,15 @@ class Extends update_share_inventory: 133, share_inventory_with_all: 134, unshare_inventory_with_all: 135, - update_share_with_all_permission_level: 136 + update_share_with_all_permission_level: 136, + protocol_description_in_task_edited: 137 } 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_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 111, 45, 46, 47, 121, 124, 115, 118, 127, 130], + 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], diff --git a/config/locales/global_activities/en.yml b/config/locales/global_activities/en.yml index a94ff18b4..818a96bd1 100644 --- a/config/locales/global_activities/en.yml +++ b/config/locales/global_activities/en.yml @@ -164,6 +164,7 @@ en: delete_chemical_structure_on_task_protocol_html: "%{user} deleted chemical structure %{asset_name} on task's protocol %{my_module}." delete_chemical_structure_on_protocol_html: "%{user} deleted chemical structure %{asset_name} on protocol %{protocol}." delete_chemical_structure_on_task_html: "%{user} deleted chemical structure %{asset_name} on task %{my_module}." + protocol_description_in_task_edited_html: "%{user} edited protocol description on task %{my_module}." activity_name: create_project: "Project created" @@ -293,6 +294,7 @@ en: delete_chemical_structure_on_task_protocol: "Chemical structure on task protocol deleted" delete_chemical_structure_on_protocol: "Chemical structure on protocol deleted" delete_chemical_structure_on_task: "Chemical structure on task deleted" + protocol_description_in_task_edited: "Protocol description in task edited" activity_group: projects: "Projects"