From f586865696840dfc36f16ef34f89f300fbd539ba Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 25 May 2021 13:14:57 +0200 Subject: [PATCH] Small report wizard fixes [SCI-5758] --- app/controllers/reports_controller.rb | 5 ++--- app/views/reports/wizard/_third_step.html.erb | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index d58ee8120..52d7888f2 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -51,8 +51,7 @@ class ReportsController < ApplicationController # Report grouped by modules def new @templates = Extends::REPORT_TEMPLATES - @active_template = @templates.one? ? @templates.keys[0] : nil - @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 = current_team.reports.new end @@ -115,7 +114,7 @@ class ReportsController < ApplicationController @edit = true @templates = Extends::REPORT_TEMPLATES @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? @project_contents = { diff --git a/app/views/reports/wizard/_third_step.html.erb b/app/views/reports/wizard/_third_step.html.erb index 1ab7567ab..fd5ac3ad2 100644 --- a/app/views/reports/wizard/_third_step.html.erb +++ b/app/views/reports/wizard/_third_step.html.erb @@ -157,6 +157,7 @@ <%= t("projects.reports.wizard.third_step.results_comments") %> +