scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 10:06:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix hound [SCI-8007]

Browse source
This commit is contained in:
sboursen-scinote 2023-03-09 22:13:52 +01:00
parent 506c750eee
commit 36782611b4
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/protocols/index.js
View file

@ -616,7 +616,14 @@ var ProtocolsIndex = (function() {
columns: [
{ data: '1' }
],
lengthMenu: [[10, 25, 50], ['Show 10 per page', 'Show 25 per page', 'Show 50 per page']],
lengthMenu: [
[10, 25, 50],
[
I18n.t('protocols.index.linked_children.length_menu', { number: 10 }),
I18n.t('protocols.index.linked_children.length_menu', { number: 25 }),
I18n.t('protocols.index.linked_children.length_menu', { number: 50 })
]
],
language: {
lengthMenu: '_MENU_'
},

6
app/datatables/protocol_linked_children_datatable.rb
View file

@ -87,9 +87,9 @@ class ProtocolLinkedChildrenDatatable < CustomDatatable
def filter_child_records(records)
if params[:version].present?
version = params[:version]
records = records.joins("LEFT JOIN protocols protocol_parents " \
"ON protocols.parent_id = protocol_parents.id ")
.where("protocol_parents.version_number = #{version}")
records = records.joins('LEFT JOIN protocols protocol_parents ' \
'ON protocols.parent_id = protocol_parents.id ')
.where('protocol_parents.version_number = #{version}')
end
records
end