scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-07 05:03:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Minor fix for assets & tables naming in export all PDF

Browse source
This commit is contained in:
Matej Zrimšek 2018-09-06 19:14:50 +02:00
parent 0ebce8e283
commit 6f77c4772c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/reports_helper.rb
View file

@ -66,7 +66,7 @@ module ReportsHelper
obj_name = if element['type_of'] == 'result_asset' obj_name = if element['type_of'] == 'result_asset'
Asset.find(element[:result_id]).file_file_name Asset.find(element[:result_id]).file_file_name
else else
Table.find(element[:result_id]).result.name locals[:name] = Result.find(element[:result_id]).name
end end
obj_folder_name = 'Results attachments' obj_folder_name = 'Results attachments'
parent_module = parent parent_module = parent

2
app/views/reports/elements/_step_table_element.html.erb
View file

@ -10,7 +10,7 @@
<% if defined? path and path.present? %> <% if defined? path and path.present? %>
<a href="<%= path %>"> <a href="<%= path %>">
<em><%=t 'projects.reports.elements.step_table.table_name', <em><%=t 'projects.reports.elements.step_table.table_name',
name: truncate(table && table.name ? "#{table.name}.csv" : "#{table.step.name}.csv", name: truncate(table && table.name.present? ? "#{table.name}.csv" : "#{table.step.name}.csv",
length: Constants::FILENAME_TRUNCATION_LENGTH) %></em> length: Constants::FILENAME_TRUNCATION_LENGTH) %></em>
</a> </a>
<% else %> <% else %>