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

Merge pull request #965 from Zanz2/sub_prot_2short_SCI1995

Browse source 
Changed sub protocol name length limit to limit of protocol titles on scinote [SCI-1995]
This commit is contained in:
Zanz2 2018-01-26 15:08:03 +01:00 • committed by GitHub
commit a15e624b06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/helpers/protocols_io_helper.rb
View file

@ -175,9 +175,13 @@ module ProtocolsIoHelper
else else
' , ' ' , '
end end
output_string += prepare_for_view( if attribute_name == 'protocol_name'
attribute_text, ProtocolsIoHelper::PIO_ELEMENT_RESERVED_LENGTH_SMALL output_string += pio_eval_title_len(attribute_text)
) else
output_string += prepare_for_view(
attribute_text, ProtocolsIoHelper::PIO_ELEMENT_RESERVED_LENGTH_SMALL
)
end
output_string output_string
end end

2
app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb
View file

@ -98,7 +98,7 @@
<% when '18'%> <% when '18'%>
<br> <br>
<strong><%= t('protocols.protocols_io_import.preview.sub_prot') %></strong> <strong><%= t('protocols.protocols_io_import.preview.sub_prot') %></strong>
<%= prepare_for_view(key['source_data']['protocol_name'],ProtocolsIoHelper::PIO_ELEMENT_RESERVED_LENGTH_SMALL,'table').html_safe %> <%= pio_eval_title_len(sanitize_input(key['source_data']['protocol_name'])).html_safe %>
<br> <br>
<%= t('protocols.protocols_io_import.preview.auth') %> <%= t('protocols.protocols_io_import.preview.auth') %>
<%= prepare_for_view(key['source_data']['full_name'],ProtocolsIoHelper::PIO_ELEMENT_RESERVED_LENGTH_SMALL,'table').html_safe %> <%= prepare_for_view(key['source_data']['full_name'],ProtocolsIoHelper::PIO_ELEMENT_RESERVED_LENGTH_SMALL,'table').html_safe %>