scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-10 13:59:56 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #452 from okriuchykhin/ok_SCI_949

Browse source 
Fix error when referencing deleted sample in SA [SCI-949]
This commit is contained in:
okriuchykhin 2017-01-25 17:26:48 +01:00 • committed by GitHub
commit 6610c75bfc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/application_helper.rb
View file

@ -77,7 +77,7 @@ module ApplicationHelper
if project.archived? if project.archived?
"<span class='sa-type'>#{sanitize(match[2])}</span> " \ "<span class='sa-type'>#{sanitize(match[2])}</span> " \
"#{link_to project.name, "#{link_to project.name,
projects_archive_path} #{t'atwho.res.archived'}" projects_archive_path} #{I18n.t('atwho.res.archived')}"
else else
"<span class='sa-type'>#{sanitize(match[2])}</span> " \ "<span class='sa-type'>#{sanitize(match[2])}</span> " \
"#{link_to project.name, "#{link_to project.name,
@ -90,7 +90,7 @@ module ApplicationHelper
"<span class='sa-type'>#{sanitize(match[2])}</span> " \ "<span class='sa-type'>#{sanitize(match[2])}</span> " \
"#{link_to experiment.name, "#{link_to experiment.name,
experiment_archive_project_path(experiment.project)} " \ experiment_archive_project_path(experiment.project)} " \
"#{t'atwho.res.archived'}" "#{I18n.t('atwho.res.archived')}"
else else
"<span class='sa-type'>#{sanitize(match[2])}</span> " \ "<span class='sa-type'>#{sanitize(match[2])}</span> " \
"#{link_to experiment.name, "#{link_to experiment.name,
@ -103,7 +103,7 @@ module ApplicationHelper
"<span class='sa-type'>#{sanitize(match[2])}</span> " \ "<span class='sa-type'>#{sanitize(match[2])}</span> " \
"#{link_to my_module.name, "#{link_to my_module.name,
module_archive_experiment_path(my_module.experiment)} " \ module_archive_experiment_path(my_module.experiment)} " \
"#{t'atwho.res.archived'}" "#{I18n.t('atwho.res.archived')}"
else else
"<span class='sa-type'>#{sanitize(match[2])}</span> " \ "<span class='sa-type'>#{sanitize(match[2])}</span> " \
"#{link_to my_module.name, "#{link_to my_module.name,
@ -118,7 +118,7 @@ module ApplicationHelper
class: 'sample-info-link')}" class: 'sample-info-link')}"
else else
"<span class='glyphicon glyphicon-tint'></span> " \ "<span class='glyphicon glyphicon-tint'></span> " \
"#{match[1]} #{t'atwho.res.deleted'}" "#{match[1]} #{I18n.t('atwho.res.deleted')}"
end end
end end
end end