mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 14:45:56 +08:00
Add task description and task protocol description activities
This commit is contained in:
parent
111056a032
commit
68284c10da
|
@ -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(
|
||||
|
|
|
@ -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],
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue