From 07ce65f5e6ded1e4c7cfa35934def41350d3dce2 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 29 Sep 2023 10:38:27 +0400 Subject: [PATCH] DOCX not working if result name empty. --- app/services/reports/docx/draw_result_asset.rb | 2 +- app/services/reports/docx/draw_result_table.rb | 2 +- app/services/reports/docx/draw_result_text.rb | 2 +- .../reports/elements/_my_module_result_asset_element.html.erb | 2 +- .../reports/elements/_my_module_result_table_element.html.erb | 2 +- .../reports/elements/_my_module_result_text_element.html.erb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/services/reports/docx/draw_result_asset.rb b/app/services/reports/docx/draw_result_asset.rb index ea5a02136..1558da450 100644 --- a/app/services/reports/docx/draw_result_asset.rb +++ b/app/services/reports/docx/draw_result_asset.rb @@ -18,7 +18,7 @@ module Reports::Docx::DrawResultAsset end @docx.p do - text result.name, italic: true + text result.name.presence || '(unnamed)', italic: true text ' ' link I18n.t('projects.reports.elements.download'), asset_url do italic true diff --git a/app/services/reports/docx/draw_result_table.rb b/app/services/reports/docx/draw_result_table.rb index d2625c386..90df6b1ca 100644 --- a/app/services/reports/docx/draw_result_table.rb +++ b/app/services/reports/docx/draw_result_table.rb @@ -38,7 +38,7 @@ module Reports::Docx::DrawResultTable end end @docx.p do - text result.name, italic: true + text result.name.presence || '(unnamed)', italic: true text " #{I18n.t('search.index.archived')} ", bold: true if result.archived? text ' ' text I18n.t 'projects.reports.elements.result_table.table_name', name: table.name diff --git a/app/services/reports/docx/draw_result_text.rb b/app/services/reports/docx/draw_result_text.rb index 11670ba1d..d229d7cd2 100644 --- a/app/services/reports/docx/draw_result_text.rb +++ b/app/services/reports/docx/draw_result_text.rb @@ -8,7 +8,7 @@ module Reports::Docx::DrawResultText color = @color @docx.p @docx.p do - text result.name, italic: true + text result.name.presence || '(unnamed)', italic: true text " #{I18n.t('search.index.archived')} ", bold: true if result.archived? text ' ' text I18n.t('projects.reports.elements.result_table.user_time', diff --git a/app/views/reports/elements/_my_module_result_asset_element.html.erb b/app/views/reports/elements/_my_module_result_asset_element.html.erb index fe205856f..c5631831a 100644 --- a/app/views/reports/elements/_my_module_result_asset_element.html.erb +++ b/app/views/reports/elements/_my_module_result_asset_element.html.erb @@ -7,7 +7,7 @@ <%= file_extension_icon_html(asset, true) %> - <%= result.name %> + <%= result.name.presence || '(unnamed)' %> <% if result.archived? %> <%= t('search.index.archived') %> <% end %> diff --git a/app/views/reports/elements/_my_module_result_table_element.html.erb b/app/views/reports/elements/_my_module_result_table_element.html.erb index 70b912c25..33aef58b5 100644 --- a/app/views/reports/elements/_my_module_result_table_element.html.erb +++ b/app/views/reports/elements/_my_module_result_table_element.html.erb @@ -6,7 +6,7 @@
- <%= name %> + <%= name.presence || '(unnamed)' %> <% if result.archived? %> <%= t('search.index.archived') %> <% end %> diff --git a/app/views/reports/elements/_my_module_result_text_element.html.erb b/app/views/reports/elements/_my_module_result_text_element.html.erb index d5ae4dfcf..14648a9dc 100644 --- a/app/views/reports/elements/_my_module_result_text_element.html.erb +++ b/app/views/reports/elements/_my_module_result_text_element.html.erb @@ -6,7 +6,7 @@
- <%= name %> + <%= name.presence || '(unnamed)' %> <% if result.archived? %> <%= t('search.index.archived') %> <% end %>