From ea455d359693a4bd09b58099600d28d6d44a2d60 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Thu, 15 Jun 2017 09:43:10 +0200
Subject: [PATCH 1/3] fix no repository name in activity bug

---
 app/controllers/my_modules_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb
index 67621878e..be9eec021 100644
--- a/app/controllers/my_modules_controller.rb
+++ b/app/controllers/my_modules_controller.rb
@@ -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(', ')
           )
         )

From 4566fc7191f6eb605a0043493b58575d860b004b Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Thu, 15 Jun 2017 10:06:12 +0200
Subject: [PATCH 2/3] fix text in activity for assign/unassign records message

---
 config/locales/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 297f87eff..df9393351 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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 records(s) <strong>%{records}</strong> from <strong>%{repository}</strong> repository to task <strong>%{task}</strong>"
+    unassign_repository_records: "<i>%{user}</i> unassigned records(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>."

From 86530bbda034dd17c1470ad47966026ee9638b43 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Fri, 16 Jun 2017 14:41:50 +0200
Subject: [PATCH 3/3] fix flash text

---
 config/locales/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index df9393351..f5a779000 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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 records(s) <strong>%{records}</strong> from <strong>%{repository}</strong> repository to task <strong>%{task}</strong>"
-    unassign_repository_records: "<i>%{user}</i> unassigned records(s) <strong>%{records}</strong> from <strong>%{repository}</strong> repository 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>."