X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/28d5074cdf748cd4da9e98d6202925fdbbf678cc..e8c9386ffbd11cfcbedb63fa1681d5c0590ba7a5:/apps/workbench/app/views/application/_report_error.html.erb

diff --git a/apps/workbench/app/views/application/_report_error.html.erb b/apps/workbench/app/views/application/_report_error.html.erb
index f79a76905a..7ebfddb711 100644
--- a/apps/workbench/app/views/application/_report_error.html.erb
+++ b/apps/workbench/app/views/application/_report_error.html.erb
@@ -1,17 +1,21 @@
 <p>
 <br/><strong>If you suspect this is a bug, you can help us fix it by sending us a problem report:</strong></br></br>
-<% if api_error %>
-  Send a problem report right here. <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, action_method: 'post', api_error_request_url: api_error.request_url, api_error_response: api_error.api_response_s),
+<% if error_type == 'api' %>
+  <%
+    api_request_url = api_error.andand.request_url ? api_error.request_url : ''
+    api_error_response = api_error.andand.api_response ? api_error.api_response : ''
+  %>
+  Send a problem report right here. <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, current_path: request.fullpath, action_method: 'post', api_error_request_url: api_request_url, api_error_response: api_error_response),
         {class: 'btn btn-primary report-issue-modal-window', 'data-toggle' =>  "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
         <i class="fa fa-fw fa-support"></i> Report problem
   <% end %>
 <% else %>
-  Send a problem report right here. <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, action_method: 'post', error_message: error_message),
+  Send a problem report right here. <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, current_path: request.fullpath, action_method: 'post', error_message: error_message),
         {class: 'btn btn-primary report-issue-modal-window', 'data-toggle' =>  "modal", 'data-target' => '#report-issue-modal-window', :remote => true, return_to: request.url} do %>
         <i class="fa fa-fw fa-support"></i> Report problem
   <% end %>
 <% end %>
 <% support_email = Rails.configuration.support_email_address%>
 <br/></br>
-  If you prefer email, send to: <a href="mailto:<%=support_email%>?subject=Workbench problem report&body=Problem while viewing page <%=request.url%>"><%=support_email%></a>
+  If you prefer, send email to: <a href="mailto:<%=support_email%>?subject=Workbench problem report&&amp;body=Problem while viewing page <%=request.url%>"><%=support_email%></a>
 </p>