From 6f77c4772c7825a51c51a33f8d77e88c892113e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= <zrimsekmatej@gmail.com>
Date: Thu, 6 Sep 2018 19:14:50 +0200
Subject: [PATCH] Minor fix for assets & tables naming in export all PDF

---
 app/helpers/reports_helper.rb                           | 2 +-
 app/views/reports/elements/_step_table_element.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb
index d266827c9..ceac40a9b 100644
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@@ -66,7 +66,7 @@ module ReportsHelper
         obj_name = if element['type_of'] == 'result_asset'
                      Asset.find(element[:result_id]).file_file_name
                    else
-                     Table.find(element[:result_id]).result.name
+                     locals[:name] = Result.find(element[:result_id]).name
                    end
         obj_folder_name = 'Results attachments'
         parent_module = parent
diff --git a/app/views/reports/elements/_step_table_element.html.erb b/app/views/reports/elements/_step_table_element.html.erb
index e129b28de..c35ab2bf4 100644
--- a/app/views/reports/elements/_step_table_element.html.erb
+++ b/app/views/reports/elements/_step_table_element.html.erb
@@ -10,7 +10,7 @@
         <% if defined? path and path.present? %>
           <a href="<%= path %>">
             <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>
           </a>
         <% else %>