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 #3349 from aignatov-bio/ai-sci-5758-small-report-wizard-fixes

Browse source 
Small report wizard fixes [SCI-5758]
This commit is contained in:
Alex Kriuchykhin 2021-05-27 14:28:21 +02:00 committed by GitHub
parent 90b02f9d4a f586865696
commit 967ec1fdbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/reports_controller.rb
View file

@ -51,8 +51,7 @@ class ReportsController < ApplicationController
# Report grouped by modules # Report grouped by modules
def new def new
@templates = Extends::REPORT_TEMPLATES @templates = Extends::REPORT_TEMPLATES
@active_template = @templates.one? ? @templates.keys[0] : nil @repositories = Repository.accessible_by_teams(current_team).active.select(:id, :name).order(:name)
@repositories = Repository.accessible_by_teams(current_team).active.select(:id, :name)
@report = current_team.reports.new @report = current_team.reports.new
end end
@ -115,7 +114,7 @@ class ReportsController < ApplicationController
@edit = true @edit = true
@templates = Extends::REPORT_TEMPLATES @templates = Extends::REPORT_TEMPLATES
@active_template = @report.settings[:template] @active_template = @report.settings[:template]
@repositories = Repository.accessible_by_teams(current_team).active.select(:id, :name) @repositories = Repository.accessible_by_teams(current_team).active.select(:id, :name).order(:name)
@report.settings = Report::DEFAULT_SETTINGS if @report.settings.blank? @report.settings = Report::DEFAULT_SETTINGS if @report.settings.blank?
@project_contents = { @project_contents = {

1
app/views/reports/wizard/_third_step.html.erb
View file

@ -157,6 +157,7 @@
<span class="sci-checkbox-label"></span> <span class="sci-checkbox-label"></span>
</span> </span>
<%= t("projects.reports.wizard.third_step.results_comments") %> <%= t("projects.reports.wizard.third_step.results_comments") %>
<div class="divider"></div>
</li> </li>
</ul> </ul>
<div class="divider"></div> <div class="divider"></div>