scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-09 16:01:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix default selection of results in reports wizard [SCI-5726]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2021-05-13 15:44:06 +02:00
parent dde82423f1
commit 167ebd3d58
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/report.rb
View file

@ -46,7 +46,7 @@ class Report < ApplicationRecord
step_tables: true, step_tables: true,
step_comments: true step_comments: true
}, },
file_results: false, file_results: true,
file_results_previews: false, file_results_previews: false,
table_results: true, table_results: true,
text_results: true, text_results: true,

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

@ -99,12 +99,14 @@
<label> <label>
<%= t("projects.reports.wizard.third_step.order_results") %> <%= t("projects.reports.wizard.third_step.order_results") %>
</label> </label>
<select class="order-results" id="taskResultsOrder"> <%= select_tag :taskResultsOrder,
<option value="atoz"><%= t("projects.reports.wizard.third_step.atoz") %></option> options_for_select([
<option value="ztoa"><%= t("projects.reports.wizard.third_step.ztoa") %></option> [t('projects.reports.wizard.third_step.atoz'), 'atoz'],
<option value="new"><%= t("projects.reports.wizard.third_step.new_results") %></option> [t('projects.reports.wizard.third_step.ztoa'), 'ztoa'],
<option value="old"><%= t("projects.reports.wizard.third_step.old_results") %></option> [t('projects.reports.wizard.third_step.new_results'), 'new'],
</select> [t('projects.reports.wizard.third_step.old_results'), 'old']
], selected: report.settings.dig(:task, :result_order)),
class: 'order-results' %>
</div> </div>
</span> </span>
</div> </div>