scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix snapshots for deleted inventory [SCI-5826] (#3393)

Browse source
This commit is contained in:
aignatov-bio 2021-06-16 15:23:34 +02:00 committed by GitHub
parent 1e830a49f3
commit 12d8b84cfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/services/reports/docx/draw_my_module.rb
View file

@ -89,11 +89,8 @@ module Reports::Docx::DrawMyModule
end
@settings['deleted_repositories']&.each do |repo|
draw_my_module_repository(nil,
my_module,
my_module.repository_snapshots
.where(parent_id: repo)
.find_by(selected: true))
snapshot = my_module.repository_snapshots.where(parent_id: repo).find_by(selected: true)
draw_my_module_repository(nil, my_module, snapshot) if snapshot
end
@docx.p

3
app/views/reports/elements/_my_module_element.html.erb
View file

@ -100,7 +100,8 @@
<% end %>
<% @settings['deleted_repositories']&.each do |repo| %>
<%= render partial: 'reports/elements/my_module_repository_element.html.erb', locals: { repository_snapshot: my_module.repository_snapshots.where(parent_id: repo).find_by(selected: true), export_all: export_all, my_module: my_module } %>
<% snapshot = my_module.repository_snapshots.where(parent_id: repo).find_by(selected: true) %>
<%= render partial: 'reports/elements/my_module_repository_element.html.erb', locals: { repository_snapshot: snapshot, export_all: export_all, my_module: my_module } if snapshot %>
<% end %>
</div>