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

Merge pull request #2635 from urbanrotnik/ur-sci-4724-fix-report-default-snapshot

Browse source 
Fix for default snapshot in report [SCI-4724]
This commit is contained in:
Miha Mencin 2020-06-03 13:06:34 +02:00 committed by GitHub
parent 21e048c52e 50bc313853
commit 1a5c8c104a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/reports_helper.rb
View file

@ -125,6 +125,11 @@ module ReportsHelper
def assigned_repository_or_snapshot(my_module, element_id, snapshot, repository)
if element_id
repository = Repository.accessible_by_teams(my_module.experiment.project.team).find_by(id: element_id)
# Check for default set snapshots when repository still exists
if repository
selected_snapshot = repository.repository_snapshots.where(my_module: my_module).find_by(selected: true)
repository = selected_snapshot if selected_snapshot
end
repository ||= RepositorySnapshot.joins(my_module: { experiment: :project })
.where(my_module: { experiments: { project: my_module.experiment.project } })
.find_by(id: element_id)