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

add experiment level to user smart annotation notification

Browse source
This commit is contained in:
Mojca Lorber 2017-04-20 13:05:49 +02:00
parent b1e939e715
commit 0bae4657f6
7 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/concerns/steps_actions.rb
View file

@ -126,6 +126,10 @@ module StepsActions
step.my_module.experiment.project.name, step.my_module.experiment.project.name,
project_url(step.my_module.experiment.project) 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( my_module: link_to(
step.my_module.name, step.my_module.name,
protocols_my_module_url(step.my_module) protocols_my_module_url(step.my_module)

3
app/controllers/my_module_comments_controller.rb
View file

@ -212,6 +212,9 @@ class MyModuleCommentsController < ApplicationController
project_url(@my_module project_url(@my_module
.experiment .experiment
.project)), .project)),
experiment: link_to(@my_module.experiment.name,
canvas_experiment_url(@my_module
.experiment)),
my_module: link_to(@my_module.name, my_module: link_to(@my_module.name,
protocols_my_module_url( protocols_my_module_url(
@my_module @my_module

3
app/controllers/result_comments_controller.rb
View file

@ -211,6 +211,9 @@ class ResultCommentsController < ApplicationController
project_url(@result.my_module project_url(@result.my_module
.experiment .experiment
.project)), .project)),
experiment: link_to(@result.my_module.experiment.name,
canvas_experiment_url(@result.my_module
.experiment)),
my_module: link_to(@result.my_module.name, my_module: link_to(@result.my_module.name,
protocols_my_module_url( protocols_my_module_url(
@result.my_module @result.my_module

3
app/controllers/result_texts_controller.rb
View file

@ -232,6 +232,9 @@ class ResultTextsController < ApplicationController
project_url(@result.my_module project_url(@result.my_module
.experiment .experiment
.project)), .project)),
experiment: link_to(@result.my_module.experiment.name,
canvas_experiment_url(@result.my_module
.experiment)),
my_module: link_to(@result.my_module.name, my_module: link_to(@result.my_module.name,
protocols_my_module_url( protocols_my_module_url(
@result.my_module @result.my_module

3
app/controllers/step_comments_controller.rb
View file

@ -220,6 +220,9 @@ class StepCommentsController < ApplicationController
project_url(@step.my_module project_url(@step.my_module
.experiment .experiment
.project)), .project)),
experiment: link_to(@step.my_module.experiment.name,
canvas_experiment_url(@step.my_module
.experiment)),
my_module: link_to(@step.my_module.name, my_module: link_to(@step.my_module.name,
protocols_my_module_url( protocols_my_module_url(
@step.my_module @step.my_module

2
app/models/activity.rb
View file

@ -97,7 +97,7 @@ class Activity < ActiveRecord::Base
.url_helpers .url_helpers
.protocols_my_module_path(my_module)}'> .protocols_my_module_path(my_module)}'>
#{my_module.name}</a>" if my_module #{my_module.name}</a>" if my_module
byebug
notification = Notification.create( notification = Notification.create(
type_of: notification_type, type_of: notification_type,
title: title:

16
config/locales/en.yml
View file

@ -740,7 +740,7 @@ en:
no_archived_modules: "No archived tasks!" no_archived_modules: "No archived tasks!"
restore_option: "Restore" restore_option: "Restore"
archived_on: "Archived on" 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: my_module_groups:
new: new:
@ -1028,9 +1028,9 @@ en:
add_comment_to_project: "<i>%{user}</i> commented on project <strong>%{project}</strong>." add_comment_to_project: "<i>%{user}</i> commented on project <strong>%{project}</strong>."
edit_project_comment: "<i>%{user}</i> edited comment on project <strong>%{project}</strong>." edit_project_comment: "<i>%{user}</i> edited comment on project <strong>%{project}</strong>."
delete_project_comment: "<i>%{user}</i> deleted comment on project <strong>%{project}</strong>." delete_project_comment: "<i>%{user}</i> deleted comment on project <strong>%{project}</strong>."
add_comment_to_module: "<i>%{user}</i> commented on module <strong>%{module}</strong>." add_comment_to_module: "<i>%{user}</i> commented on task <strong>%{module}</strong>."
edit_module_comment: "<i>%{user}</i> edited comment on module <strong>%{module}</strong>." edit_module_comment: "<i>%{user}</i> edited comment on task <strong>%{module}</strong>."
delete_module_comment: "<i>%{user}</i> deleted comment on module <strong>%{module}</strong>." delete_module_comment: "<i>%{user}</i> deleted comment on task <strong>%{module}</strong>."
edit_step_comment: "<i>%{user}</i> edited comment on Step %{step} <strong>%{step_name}</strong>." edit_step_comment: "<i>%{user}</i> edited comment on Step %{step} <strong>%{step_name}</strong>."
delete_step_comment: "<i>%{user}</i> deleted comment on Step %{step} <strong>%{step_name}</strong>." delete_step_comment: "<i>%{user}</i> deleted comment on Step %{step} <strong>%{step_name}</strong>."
edit_result_comment: "<i>%{user}</i> edited comment on result <strong>%{result}</strong>." edit_result_comment: "<i>%{user}</i> edited comment on result <strong>%{result}</strong>."
@ -1520,19 +1520,19 @@ en:
recent_changes: "Recent changes" recent_changes: "Recent changes"
system_message: "sciNote system message" system_message: "sciNote system message"
deliver: 'Exportable content' 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}" experiment_annotation_message_html: "Project: %{project} | Experiment: %{experiment}"
project_comment_annotation_title: "%{user} mentioned you in a comment on project %{project}." project_comment_annotation_title: "%{user} mentioned you in a comment on project %{project}."
project_annotation_message_html: "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_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_comment_annotation_title: "%{user} mentioned you in a comment on step %{step}."
step_description_title: "%{user} mentioned you in a description 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}." 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_annotation_title: "%{user} mentioned you in result %{result}."
result_comment_annotation_title: "%{user} mentioned you in a comment on 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_title: "%{user} mentioned you in Column: %{column} of Sample %{sample}"
sample_annotation_message_html: "Sample: %{sample} | Column: %{column}" sample_annotation_message_html: "Sample: %{sample} | Column: %{column}"
protocol_step_annotation_message_html: "Protocol: %{protocol}" protocol_step_annotation_message_html: "Protocol: %{protocol}"