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

Fixed Asset relation handling in activities [ma_SCI_5789]

Browse source
This commit is contained in:
Martin Artnik 2021-08-03 09:58:13 +02:00
parent 04b94d504d
commit 13ddff89a8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/activity.rb
View file

@ -147,10 +147,10 @@ class Activity < ApplicationRecord
generate_breadcrumb(subject.team) generate_breadcrumb(subject.team)
when Step when Step
breadcrumbs[:step] = subject.name breadcrumbs[:step] = subject.name
generate_breadcrumbs(subject.my_module) generate_breadcrumbs(subject.protocol)
when Asset when Asset
breadcrumbs[:asset] = subject.blob.filename.to_s breadcrumbs[:asset] = subject.blob.filename.to_s
generate_breadcrumb(subject.result || subject.step) generate_breadcrumb(subject.result || subject.step || subject.repository_cell.repository_row.repository)
end end
end end

2
app/models/asset.rb
View file

@ -446,7 +446,7 @@ class Asset < ApplicationRecord
end end
def my_module def my_module
(result || step).my_module (result || step)&.my_module
end end
private private