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

Merge pull request #3322 from okriuchykhin/ok_SCI_5726

Browse source 
Fix default selection of results in reports wizard [SCI-5726]
This commit is contained in:
Alex Kriuchykhin 2021-05-14 12:02:49 +02:00 committed by GitHub
commit 5e06768fa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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_comments: true
},
file_results: false,
file_results: true,
file_results_previews: false,
table_results: true,
text_results: true,

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

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