diff --git a/app/controllers/concerns/steps_actions.rb b/app/controllers/concerns/steps_actions.rb
index f7a4e9ede..293c4b2e1 100644
--- a/app/controllers/concerns/steps_actions.rb
+++ b/app/controllers/concerns/steps_actions.rb
@@ -126,6 +126,10 @@ module StepsActions
step.my_module.experiment.project.name,
project_url(step.my_module.experiment.project)
),
+ experiment: link_to(
+ step.my_module.experiment.name,
+ canvas_experiment_url(step.my_module.experiment)
+ ),
my_module: link_to(
step.my_module.name,
protocols_my_module_url(step.my_module)
diff --git a/app/controllers/my_module_comments_controller.rb b/app/controllers/my_module_comments_controller.rb
index 8b268ed7f..994cd6c03 100644
--- a/app/controllers/my_module_comments_controller.rb
+++ b/app/controllers/my_module_comments_controller.rb
@@ -212,6 +212,9 @@ class MyModuleCommentsController < ApplicationController
project_url(@my_module
.experiment
.project)),
+ experiment: link_to(@my_module.experiment.name,
+ canvas_experiment_url(@my_module
+ .experiment)),
my_module: link_to(@my_module.name,
protocols_my_module_url(
@my_module
diff --git a/app/controllers/result_comments_controller.rb b/app/controllers/result_comments_controller.rb
index cca7cef2f..d65a03dc2 100644
--- a/app/controllers/result_comments_controller.rb
+++ b/app/controllers/result_comments_controller.rb
@@ -211,6 +211,9 @@ class ResultCommentsController < ApplicationController
project_url(@result.my_module
.experiment
.project)),
+ experiment: link_to(@result.my_module.experiment.name,
+ canvas_experiment_url(@result.my_module
+ .experiment)),
my_module: link_to(@result.my_module.name,
protocols_my_module_url(
@result.my_module
diff --git a/app/controllers/result_texts_controller.rb b/app/controllers/result_texts_controller.rb
index 9d5660d3a..f6969dcd8 100644
--- a/app/controllers/result_texts_controller.rb
+++ b/app/controllers/result_texts_controller.rb
@@ -232,6 +232,9 @@ class ResultTextsController < ApplicationController
project_url(@result.my_module
.experiment
.project)),
+ experiment: link_to(@result.my_module.experiment.name,
+ canvas_experiment_url(@result.my_module
+ .experiment)),
my_module: link_to(@result.my_module.name,
protocols_my_module_url(
@result.my_module
diff --git a/app/controllers/step_comments_controller.rb b/app/controllers/step_comments_controller.rb
index 3adfd6128..27b6ebf96 100644
--- a/app/controllers/step_comments_controller.rb
+++ b/app/controllers/step_comments_controller.rb
@@ -220,6 +220,9 @@ class StepCommentsController < ApplicationController
project_url(@step.my_module
.experiment
.project)),
+ experiment: link_to(@step.my_module.experiment.name,
+ canvas_experiment_url(@step.my_module
+ .experiment)),
my_module: link_to(@step.my_module.name,
protocols_my_module_url(
@step.my_module
diff --git a/app/models/activity.rb b/app/models/activity.rb
index 8560ece3a..9d483a4d3 100644
--- a/app/models/activity.rb
+++ b/app/models/activity.rb
@@ -97,7 +97,7 @@ class Activity < ActiveRecord::Base
.url_helpers
.protocols_my_module_path(my_module)}'>
#{my_module.name}" if my_module
-byebug
+
notification = Notification.create(
type_of: notification_type,
title:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b2368e13c..665a23e0b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -740,7 +740,7 @@ en:
no_archived_modules: "No archived tasks!"
restore_option: "Restore"
archived_on: "Archived on"
- archived_on_title: "Module archived on %{date} at %{time}."
+ archived_on_title: "Task archived on %{date} at %{time}."
my_module_groups:
new:
@@ -1028,9 +1028,9 @@ en:
add_comment_to_project: "%{user} commented on project %{project}."
edit_project_comment: "%{user} edited comment on project %{project}."
delete_project_comment: "%{user} deleted comment on project %{project}."
- add_comment_to_module: "%{user} commented on module %{module}."
- edit_module_comment: "%{user} edited comment on module %{module}."
- delete_module_comment: "%{user} deleted comment on module %{module}."
+ add_comment_to_module: "%{user} commented on task %{module}."
+ edit_module_comment: "%{user} edited comment on task %{module}."
+ delete_module_comment: "%{user} deleted comment on task %{module}."
edit_step_comment: "%{user} edited comment on Step %{step} %{step_name}."
delete_step_comment: "%{user} deleted comment on Step %{step} %{step_name}."
edit_result_comment: "%{user} edited comment on result %{result}."
@@ -1520,19 +1520,19 @@ en:
recent_changes: "Recent changes"
system_message: "sciNote system message"
deliver: 'Exportable content'
- experiment_annotation_title: "%{user} mentioned you in %{experiment} experiment."
+ experiment_annotation_title: "%{user} mentioned you in experiment %{experiment}."
experiment_annotation_message_html: "Project: %{project} | Experiment: %{experiment}"
project_comment_annotation_title: "%{user} mentioned you in a comment on project %{project}."
project_annotation_message_html: "Project: %{project}"
my_module_comment_annotation_title: "%{user} mentioned you in a comment on task %{my_module}."
- my_module_annotation_message_html: "Project: %{project} | Task: %{my_module}"
+ my_module_annotation_message_html: "Project: %{project} | Experiment: %{experiment} | Task: %{my_module}"
step_comment_annotation_title: "%{user} mentioned you in a comment on step %{step}."
step_description_title: "%{user} mentioned you in a description on step %{step}."
checklist_title: "%{user} mentioned you in a checklist on step %{step}."
- step_annotation_message_html: "Project: %{project} | Task: %{my_module} | Step: %{step}"
+ step_annotation_message_html: "Project: %{project} | Experiment: %{experiment} | Task: %{my_module} | Step: %{step}"
result_annotation_title: "%{user} mentioned you in result %{result}."
result_comment_annotation_title: "%{user} mentioned you in a comment on result %{result}."
- result_annotation_message_html: "Project: %{project} | Task: %{my_module}"
+ result_annotation_message_html: "Project: %{project} | Experiment: %{experiment} | Task: %{my_module}"
sample_annotation_title: "%{user} mentioned you in Column: %{column} of Sample %{sample}"
sample_annotation_message_html: "Sample: %{sample} | Column: %{column}"
protocol_step_annotation_message_html: "Protocol: %{protocol}"