scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-04-19 02:31:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix start date activity message

Browse source
This commit is contained in:
Urban Rotnik 2020-05-06 12:34:45 +02:00
parent 7e9054e6d2
commit 8ff7c33431
2 changed files with 3 additions and 3 deletions
app/controllers
my_modules_controller.rb
config/locales/global_activities
en.yml

4
app/controllers/my_modules_controller.rb
View file

@ -648,13 +648,13 @@ class MyModulesController < ApplicationController
def log_start_date_change_activity(start_date_changes) def log_start_date_change_activity(start_date_changes)
type_of = if start_date_changes[0].nil? # set started_on type_of = if start_date_changes[0].nil? # set started_on
message_items = { my_module_started_on: @my_module.due_date } message_items = { my_module_started_on: @my_module.started_on }
:set_task_start_date :set_task_start_date
elsif start_date_changes[1].nil? # remove started_on elsif start_date_changes[1].nil? # remove started_on
message_items = { my_module_started_on: start_date_changes[0] } message_items = { my_module_started_on: start_date_changes[0] }
:remove_task_start_date :remove_task_start_date
else # change started_on else # change started_on
message_items = { my_module_started_on: @my_module.due_date } message_items = { my_module_started_on: @my_module.started_on }
:change_task_start_date :change_task_start_date
end end
log_activity(type_of, @my_module, message_items) log_activity(type_of, @my_module, message_items)

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

@ -100,7 +100,7 @@ en:
rename_task_html: "%{user} renamed task %{my_module}." rename_task_html: "%{user} renamed task %{my_module}."
move_task_html: "%{user} moved task %{my_module} from experiment %{experiment_original} to experiment %{experiment_new}." move_task_html: "%{user} moved task %{my_module} from experiment %{experiment_original} to experiment %{experiment_new}."
archive_module_html: "%{user} archived task %{my_module}." archive_module_html: "%{user} archived task %{my_module}."
set_task_start_date_html: "%{user} set due date %{my_module_started_on} on task %{my_module}." set_task_start_date_html: "%{user} set start date %{my_module_started_on} on task %{my_module}."
change_task_start_date_html: "%{user} changed start date %{my_module_started_on} on task %{my_module}." change_task_start_date_html: "%{user} changed start date %{my_module_started_on} on task %{my_module}."
remove_task_start_date_html: "%{user} removed start date %{my_module_started_on} on task %{my_module}." remove_task_start_date_html: "%{user} removed start date %{my_module_started_on} on task %{my_module}."
set_task_due_date_html: "%{user} set due date %{my_module_duedate} on task %{my_module}." set_task_due_date_html: "%{user} set due date %{my_module_duedate} on task %{my_module}."