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

Merge pull request #688 from mlorb/ml_sci_1375

Browse source 
Fix no repository name in activity bug [SCI-1375]
This commit is contained in:
mlorb 2017-06-16 15:13:42 +02:00 committed by GitHub
commit 49ce08f1f5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/my_modules_controller.rb
View file

@ -417,7 +417,7 @@ class MyModulesController < ApplicationController
'activities.assign_repository_records',
user: current_user.full_name,
task: @my_module.name,
repository: @repository,
repository: @repository.name,
records: records_names.join(', ')
)
)
@ -462,7 +462,7 @@ class MyModulesController < ApplicationController
'activities.unassign_repository_records',
user: current_user.full_name,
task: @my_module.name,
repository: @repository,
repository: @repository.name,
records: records.map(&:name).join(', ')
)
)

4
config/locales/en.yml
View file

@ -1122,8 +1122,8 @@ en:
uncomplete_module: "<i>%{user}</i> uncompleted task <strong>%{module}</strong>."
assign_sample: "<i>%{user}</i> assigned sample(s) <strong>%{samples}</strong> to task(s) <strong>%{tasks}</strong>"
unassign_sample: "<i>%{user}</i> unassigned sample(s) <strong>%{samples}</strong> from task(s) <strong>%{tasks}</strong>"
assign_repository_records: "<i>%{user}</i> assigned <strong>%{repository}</strong> repository records(s) <strong>%{records}</strong> to task <strong>%{task}</strong>"
unassign_repository_records: "<i>%{user}</i> unassigned <strong>%{repository}</strong> repository records(s) <strong>%{records}</strong> from task <strong>%{task}</strong>"
assign_repository_records: "<i>%{user}</i> assigned record(s) <strong>%{records}</strong> from <strong>%{repository}</strong> repository to task <strong>%{task}</strong>"
unassign_repository_records: "<i>%{user}</i> unassigned record(s) <strong>%{records}</strong> from <strong>%{repository}</strong> repository from task <strong>%{task}</strong>"
create_step: "<i>%{user}</i> created Step %{step} <strong>%{step_name}</strong>."
destroy_step: "<i>%{user}</i> deleted Step %{step} <strong>%{step_name}</strong>."
add_comment_to_step: "<i>%{user}</i> commented on Step %{step} <strong>%{step_name}</strong>."