Merge branch 'master' into 3654-combine-selections

[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 9b18279b12232fa33998ba8df903bf8d9f99184b..28841b014c233afc74a26178e27397c38002f1c2 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,14 +1,12 @@
-Issue reported by user <%=@user.full_name%> <%=@user.email%>
+<% if @user %>
+Issue reported by user <%=@user.email%>
+<% else %>
+Issue reported
+<% end %>
 
 Details of the report:
-<% @params.each do |k, v| %>
-  <% if k.start_with? 'report_' %>
-    <% if k.start_with? 'report_additional_info' %>
-      <%  json_map = JSON.parse(v).map %>
-      <%  map_to_s = json_map.map {|k,v| "#{k}=#{v}"}.join("\n") %>
+<% if @params['report_additional_info'] %>
+<%  map_to_s = JSON.parse(@params['report_additional_info']).map {|k,v| "#{k}=#{v}"}.join("\n") %>
 <%= map_to_s %>
-    <% else %>
-<%= k %>=<%= v %>
-    <% end %>
-  <% end %>
 <% end %>
+Report text=<%=@params['report_issue_text'] %>