3112: add "report issue" button to fiddlesticks error page

diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb
index ae7dc223b704a4d77082ea59199fb026a1844ba1..7d15d9555742cd4ea2fa4b22709b89cc05b89258 100644 (file)
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -24,7 +24,7 @@ Perhaps you'd like to
 <p>
 <br/>
 <% error_message = "The #{req_item_plain_text} was not found." %>
-Would you like to report this problem?
+<strong>Would you like to report this problem?</strong></br>
 <%= link_to report_issue_popup_path(popup_type: 'report', current_location: 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

diff --git a/apps/workbench/app/views/application/api_error.html.erb b/apps/workbench/app/views/application/api_error.html.erb
index 10ffbb775fa1c637e7160adb0afde658953a7c9c..a9e9b7ad30dd62fe371de28b861448485ab14aa7 100644 (file)
--- a/apps/workbench/app/views/application/api_error.html.erb
+++ b/apps/workbench/app/views/application/api_error.html.erb
@@ -21,3 +21,19 @@ If that doesn't work, the information below can help system administrators track
   <% end %>
 </dl>
 <% end %>
+
+<p>
+<br/><strong>Would you like to report this problem?</strong></br>
+<% if api_error %>
+  <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.fullpath, action_method: 'post', api_error_request_url: api_error.request_url, api_error_response: api_error.api_response_s),
+        {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 %>
+  <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.fullpath, action_method: 'post'),
+        {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 %>
+</p>
+