From 5d372851d3679bbeb1adc4cc319c9518fed81c2e Mon Sep 17 00:00:00 2001 From: zmagod Date: Tue, 14 Mar 2017 16:24:02 +0100 Subject: [PATCH] fixes reports comment bug [fixes SCI-1100] --- .../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 +- app/views/reports/elements/_my_module_step_element.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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 7a93830f7..c863c0597 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 @@ -1,7 +1,7 @@ <% if result.blank? and @result.present? then result = @result end %> <% asset = result.asset %> <% is_image = result.asset.is_image? %> -<% comments = result.comments %> +<% comments = result.result_comments %> <% timestamp = asset.created_at %> <% name = result.name %> <% icon_class = is_image ? "glyphicon-picture" : "glyphicon-file" %> 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 65f564e78..7129f5eed 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 @@ -1,6 +1,6 @@ <% if result.blank? and @result.present? then result = @result end %> <% table = result.table %> -<% comments = result.comments %> +<% comments = result.result_comments %> <% timestamp = table.created_at %> <% name = result.name %>
" data-name="<%= name %>" data-icon-class="glyphicon-th"> 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 69a4fd40f..1530aaacb 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 @@ -1,6 +1,6 @@ <% if result.blank? and @result.present? then result = @result end %> <% result_text = result.result_text %> -<% comments = result.comments %> +<% comments = result.result_comments %> <% timestamp = result.created_at %> <% name = result.name %>
" data-name="<%= name %>" data-icon-class="glyphicon-asterisk"> diff --git a/app/views/reports/elements/_my_module_step_element.html.erb b/app/views/reports/elements/_my_module_step_element.html.erb index ced4d19f4..7a73b519e 100644 --- a/app/views/reports/elements/_my_module_step_element.html.erb +++ b/app/views/reports/elements/_my_module_step_element.html.erb @@ -3,7 +3,7 @@ <% tables = step.tables %> <% assets = step.assets %> <% checklists = step.checklists %> -<% comments = step.comments %> +<% comments = step.step_comments %>
" data-name="<%=t "projects.reports.elements.step.sidebar_name", pos: (step.position + 1), name: step.name %>" data-icon-class="glyphicon-circle-arrow-right">