3112: when you experience a git error, that is when you see it's true colors!!

diff --git a/apps/workbench/app/mailers/issue_reporter.rb b/apps/workbench/app/mailers/issue_reporter.rb
index 1b1fa65b35bf40dd7d7fbd5bb898e8f1a6a100ac..533883b5d8fc9a7af97249c4e5b6b4e1a6ad1f4d 100644 (file)
--- a/apps/workbench/app/mailers/issue_reporter.rb
+++ b/apps/workbench/app/mailers/issue_reporter.rb
@@ -2,9 +2,9 @@ class IssueReporter < ActionMailer::Base
   default from: Rails.configuration.report_notifier_email_from
   default to: Rails.configuration.report_notifier_email_to
 
-  def send_report(user, data)
+  def send_report(user, params)
     @user = user
-    @data = data
+    @params = params
     mail(subject: 'Issue reported')
   end
 end

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 924787af6835b6fd65f5a5ece9cc7999511558f6..85aeae6be91c844479c71ac1268e8ac927114c67 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,8 +5,22 @@
   arvados_base = Rails.configuration.arvados_v1_base
   support_email = Rails.configuration.support_email_address
 
-  additional_info = "User's email: " + current_user.email + "\n" +
-                    "Current Location: " + @popup_params[:current_location]
+  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_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
 %>
 <div class="modal-dialog modal-with-loading-spinner">
   <div class="modal-content">
@@ -32,35 +46,35 @@
         <div class="form-group">
           <label for="support_version" class="col-sm-4 control-label"> Support email </label>
           <div class="col-sm-8">
-            <p class="form-control-static" id="support_version" name="support_version"><%=support_email%></p>
+            <p class="form-control-static" name="support_version"><%=support_email%></p>
           </div>
         </div>
 
         <div class="form-group">
           <label for="server_version" class="col-sm-4 control-label"> Server Version </label>
           <div class="col-sm-8">
-            <p class="form-control-static" id="server_version" name="server_version"><%=api_version%></p>
+            <p class="form-control-static" name="server_version"><%=api_version%></p>
           </div>
         </div>
 
         <div class="form-group">
           <label for="generated_at" class="col-sm-4 control-label"> Server restarted at </label>
           <div class="col-sm-8">
-            <p class="form-control-static" id="generated_at" name="generated_at"><%=generated_at%></p>
+            <p class="form-control-static" name="generated_at"><%=generated_at%></p>
           </div>
         </div>
 
         <div class="form-group">
           <label for="wb_version" class="col-sm-4 control-label"> Workbench version </label>
           <div class="col-sm-8">
-            <p class="form-control-static" id="wb_version" name="wb_version"><%=wb_version%></p>
+            <p class="form-control-static" name="wb_version"><%=wb_version%></p>
           </div>
         </div>
 
         <div class="form-group">
           <label for="arvados_base" class="col-sm-4 control-label"> Arvados base </label>
           <div class="col-sm-8">
-            <p class="form-control-static" id="arvados_base" name="arvados_base"><%=arvados_base%></p>
+            <p class="form-control-static" name="arvados_base"><%=arvados_base%></p>
           </div>
         </div>
 
@@ -68,7 +82,7 @@
           <div class="form-group">
             <label for="report_text" class="col-sm-4 control-label"> Report text </label>
             <div class="col-sm-8">
-              <textarea class="form-control" id="report_text" rows="1" name="report_text" type="text"/>
+              <textarea class="form-control" rows="1" name="report_text" type="text"/>
             </div>
           </div>
         <% end %>
@@ -76,8 +90,10 @@
         <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" id="additional_info" rows="1" name="additional_info" type="text"><%=additional_info%></textarea>
+            <textarea readonly class="form-control" rows="1" name="additional_info" type="text"><%=additional_info_to_s%></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/issue_reporter/send_report.text.erb b/apps/workbench/app/views/issue_reporter/send_report.text.erb
index a63869d2bbd3f02299b8883ed9beb0703f1a5967..9b18279b12232fa33998ba8df903bf8d9f99184b 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,14 @@
 Issue reported by user <%=@user.full_name%> <%=@user.email%>
-Details of the report: <%=@data.inspect%>
+
+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") %>
+<%= map_to_s %>
+    <% else %>
+<%= k %>=<%= v %>
+    <% end %>
+  <% end %>
+<% end %>