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

Merge pull request #3281 from aignatov-bio/ai-sci-fix-report-assigned-repository-items

Browse source 
Fix report assigned repository items
This commit is contained in:
Alex Kriuchykhin 2021-05-04 12:53:51 +02:00 committed by GitHub
commit f529dc649e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/reports_helper.rb
View file

@ -210,7 +210,8 @@ module ReportsHelper
repository = Repository.accessible_by_teams(report.team).where(name: repository_name).take
return RepositoryRow.none if repository.blank?
my_modules = MyModule.where(experiment: { project: report.project })
my_modules = MyModule.joins(:experiment)
.where(experiment: { project: report.project })
.where(id: report.report_elements.my_module.select(:my_module_id))
repository.repository_rows.joins(:my_modules).where(my_modules: my_modules)
end

4
app/views/reports/modals/_regenerate.html.erb
View file

@ -18,8 +18,8 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.no_button') %></button>
<button type="button" class="btn btn-primary btn-confirm"><%= t('general.yes_button') %></button>
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.no') %></button>
<button type="button" class="btn btn-primary btn-confirm"><%= t('general.yes') %></button>
</div>
</div>
</div>