scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 21:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #586 from ZmagoD/zd_SCI_1228

Browse source 
adds asc order to checklists [fixes SCI-1228]
This commit is contained in:
Zmago Devetak 2017-05-05 10:11:24 +02:00 • committed by GitHub
commit 6bee4cc05a
5 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/concerns/report_actions.rb
View file

@ -105,7 +105,7 @@ module ReportActions
def generate_step_contents_json(step) def generate_step_contents_json(step)
res = [] res = []
if in_params? :step_checklists if in_params? :step_checklists
step.checklists.each do |checklist| step.checklists.asc.each do |checklist|
res << generate_new_el(false) res << generate_new_el(false)
res << generate_el( res << generate_el(
'reports/elements/step_checklist_element.html.erb', 'reports/elements/step_checklist_element.html.erb',

1
app/models/checklist.rb
View file

@ -22,6 +22,7 @@ class Checklist < ActiveRecord::Base
reject_if: :all_blank, reject_if: :all_blank,
allow_destroy: true allow_destroy: true
scope :asc, -> { order('checklists.created_at ASC') }
def self.search(user, include_archived, query = nil, page = 1) def self.search(user, include_archived, query = nil, page = 1)
step_ids = step_ids =
Step Step

2
app/models/protocol.rb
View file

@ -273,7 +273,7 @@ class Protocol < ActiveRecord::Base
step2.save step2.save
# Copy checklists # Copy checklists
step.checklists.each do |checklist| step.checklists.asc.each do |checklist|
checklist2 = Checklist.new( checklist2 = Checklist.new(
name: checklist.name, name: checklist.name,
step: step2 step: step2

2
app/views/protocols/index/_protocol_preview_modal_body.html.erb
View file

@ -160,7 +160,7 @@
<% unless step.checklists.blank? then %> <% unless step.checklists.blank? then %>
<div class="col-xs-12"> <div class="col-xs-12">
<% step.checklists.each do |checklist| %> <% step.checklists.asc.each do |checklist| %>
<strong><%= checklist.name %></strong> <strong><%= checklist.name %></strong>
<% if checklist.checklist_items.empty? %> <% if checklist.checklist_items.empty? %>
</br> </br>

2
app/views/steps/_step.html.erb
View file

@ -132,7 +132,7 @@
<% unless step.checklists.blank? then %> <% unless step.checklists.blank? then %>
<div class="col-xs-12"> <div class="col-xs-12">
<% step.checklists.each do |checklist| %> <% step.checklists.asc.each do |checklist| %>
<strong><%= custom_auto_link(checklist.name) %></strong> <strong><%= custom_auto_link(checklist.name) %></strong>
<% if checklist.checklist_items.empty? %> <% if checklist.checklist_items.empty? %>
</br> </br>