Merge branch 'master' into 3112-report-bug

[arvados.git] / apps / workbench / app / views / issue_reporter / send_report.text.erb

diff --git a/apps/workbench/app/views/issue_reporter/send_report.text.erb b/apps/workbench/app/views/issue_reporter/send_report.text.erb
index a63869d2bbd3f02299b8883ed9beb0703f1a5967..4cbb371ca1d0c4911cb53f5841698598c9af586a 100644 (file)
--- a/apps/workbench/app/views/issue_reporter/send_report.text.erb
+++ b/apps/workbench/app/views/issue_reporter/send_report.text.erb
@@ -1,2 +1,13 @@
+<% if @user %>
 Issue reported by user <%=@user.full_name%> <%=@user.email%>
-Details of the report: <%=@data.inspect%>
+<% else %>
+Issue reported
+<% end %>
+
+Details of the report:
+<% if @params['report_additional_info'] %>
+<% json_map = JSON.parse(@params['report_additional_info']).map %>
+<%  map_to_s = json_map.map {|k,v| "#{k}=#{v}"}.join("\n") %>
+<%= map_to_s %>
+<% end %>
+Report text=<%=@params['report_issue_text'] %>