scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 21:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix activities wording [SCI-3287] (#1635)

Browse source 
* Fix activities wording

* Adding project to export protocol
This commit is contained in:
aignatov-bio 2019-04-04 10:45:35 +02:00 • committed by GitHub
parent 5a73f3f72c
commit a1047f4597
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/protocols_controller.rb
View file

@ -804,10 +804,12 @@ class ProtocolsController < ApplicationController
@protocols.each do |p| @protocols.each do |p|
if params[:my_module_id] if params[:my_module_id]
my_module = MyModule.find(params[:my_module_id])
Activities::CreateActivityService Activities::CreateActivityService
.call(activity_type: :export_protocol_from_task, .call(activity_type: :export_protocol_from_task,
owner: current_user, owner: current_user,
subject: MyModule.find(params[:my_module_id]), project: my_module.experiment.project,
subject: my_module,
team: current_team, team: current_team,
message_items: { message_items: {
my_module: params[:my_module_id].to_i my_module: params[:my_module_id].to_i

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

@ -38,7 +38,7 @@ en:
create_project_html: "%{user} created project %{project}." create_project_html: "%{user} created project %{project}."
rename_project_html: "%{user} renamed project %{project}." rename_project_html: "%{user} renamed project %{project}."
change_project_visibility_html: "%{user} changed project %{project}'s visibility to %{visibility}." change_project_visibility_html: "%{user} changed project %{project}'s visibility to %{visibility}."
archive_project_html: "%{user} moved project %{project} to archive." archive_project_html: "%{user} archived project %{project}."
restore_project_html: "%{user} restored project %{project} from archive." restore_project_html: "%{user} restored project %{project} from archive."
add_comment_to_project_html: "%{user} commented on project %{project}." add_comment_to_project_html: "%{user} commented on project %{project}."
edit_project_comment_html: "%{user} edited comment on project %{project}." edit_project_comment_html: "%{user} edited comment on project %{project}."
@ -191,7 +191,7 @@ en:
restore_experiment: "Experiment restored" restore_experiment: "Experiment restored"
rename_task: "Task renamed" rename_task: "Task renamed"
move_task: "Task moved" move_task: "Task moved"
export_protocol_from_task: "Export protocol form task" export_protocol_from_task: "Export protocol from task"
set_task_due_date: "Task due date set" set_task_due_date: "Task due date set"
change_task_due_date: "Task due date changed" change_task_due_date: "Task due date changed"
remove_task_due_date: "Task due date removed" remove_task_due_date: "Task due date removed"