3112: simplify report message send logic

diff --git a/apps/workbench/app/views/application/_report_issue_popup.html.erb b/apps/workbench/app/views/application/_report_issue_popup.html.erb
index 85aeae6be91c844479c71ac1268e8ac927114c67..c1534a162dc4e005f50e3faede49bd07f58958ba 100644 (file)
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -5,22 +5,18 @@
   arvados_base = Rails.configuration.arvados_v1_base
   support_email = Rails.configuration.support_email_address
 
-  additional_info1 = "Current Location: " + @popup_params[:current_location]
-  additional_info1 += ("\nUser's email: " + current_user.email) if current_user
-
   additional_info = {}
   additional_info['Current Location'] = @popup_params[:current_location]
   if current_user
     additional_info['User email'] = current_user.email
   end
-  additional_info_to_s = additional_info.map {|k,v| "#{k}=#{v}"}.join("\n")
+  additional_info_str = additional_info.map {|k,v| "#{k}=#{v}"}.join("\n")
 
-  additional_info_2 = {}
-  additional_info_2['api_version'] = api_version
-  additional_info_2['generated_at'] = generated_at
-  additional_info_2['workbench_version'] = wb_version
-  additional_info_2['arvados_base'] = arvados_base
-  additional_info_2['support_email'] = support_email
+  additional_info['api_version'] = api_version
+  additional_info['generated_at'] = generated_at
+  additional_info['workbench_version'] = wb_version
+  additional_info['arvados_base'] = arvados_base
+  additional_info['support_email'] = support_email
 %>
 <div class="modal-dialog modal-with-loading-spinner">
   <div class="modal-content">
@@ -90,10 +86,9 @@
         <div class="form-group">
           <label for="additional_info" class="col-sm-4 control-label"> Additional info </label>
           <div class="col-sm-8">
-            <textarea readonly class="form-control" rows="1" name="additional_info" type="text"><%=additional_info_to_s%></textarea>
+            <textarea readonly class="form-control" rows="1" name="additional_info" type="text"><%=additional_info_str%></textarea>
         </div>
         <input type="hidden" name="report_additional_info" value="<%=additional_info.to_json%>">
-        <input type="hidden" name="report_additional_info_2" value="<%=additional_info_2.to_json%>">
       </div>
 
       <div class="modal-footer">

diff --git a/apps/workbench/app/views/application/report_issue.js.erb b/apps/workbench/app/views/application/report_issue.js.erb
index bce71b444588add1c82c2f338400e80878697c6b..6247a3c62f3b9c9a2b5b7e5ccc6386b4b6cd8ef6 100644 (file)
--- a/apps/workbench/app/views/application/report_issue.js.erb
+++ b/apps/workbench/app/views/application/report_issue.js.erb
@@ -1,2 +1,2 @@
-$("#user-setup-modal-window").modal("hide");
+$("#report-issue-modal-window").modal("hide");
 document.location.reload();

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..9afd1d2252a1c3d9be78175721f242ecd8d0817f 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,7 @@
 Issue reported by user <%=@user.full_name%> <%=@user.email%>
 
 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") %>
+<% json_map = JSON.parse(@params['report_additional_info']).map %>
+<%  map_to_s = json_map.map {|k,v| "#{k}=#{v}"}.join("\n") %>
 <%= map_to_s %>
-    <% else %>
-<%= k %>=<%= v %>
-    <% end %>
-  <% end %>
-<% end %>
+Report text=<%=@params['report_text'] %>