[ARVADOS] updated: c8a75fee345211d04894d749a7d8bfcd0925c9f1

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      | 36 ++++++++++++++++------
 apps/workbench/app/views/application/404.html.erb  |  2 +-
 .../app/views/application/api_error.html.erb       | 16 ++++++++++
 .../test/functional/application_controller_test.rb | 18 +++++++++++
 apps/workbench/test/integration/errors_test.rb     | 22 +++++++++++++
 5 files changed, 84 insertions(+), 10 deletions(-)

       via  c8a75fee345211d04894d749a7d8bfcd0925c9f1 (commit)
       via  213c5692b02c5014b211ad86808aa5f8a4f4f251 (commit)
       via  126421a50572468e5ddc0d979299c56cca7a5edd (commit)
       via  8864cde017b9214b2e5383397b182f0b5f60334c (commit)
       via  d3427aea4532d247b71b5ebfc5f5eb527e8835a2 (commit)
      from  14f6c56b96fb8b7ccd104951f9e8374540f16fa5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c8a75fee345211d04894d749a7d8bfcd0925c9f1
Author: radhika <radhika at curoverse.com>
Date:   Fri Aug 15 17:36:13 2014 -0400

    3112: add test to check the existence of "report issue" button in fiddlesticks error page

diff --git a/apps/workbench/test/integration/errors_test.rb b/apps/workbench/test/integration/errors_test.rb
index d64ce35..3f00f0e 100644
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -73,4 +73,26 @@ class ErrorsTest < ActionDispatch::IntegrationTest
     assert(page.has_no_text?(/fiddlesticks/i),
            "unrouted request returned a generic error page, not 404")
   end
+
+  test "API error page has Report problem button" do
+    visit page_with_token("active")
+
+    original_arvados_v1_base = Rails.configuration.arvados_v1_base
+
+    begin
+      # point to a bad api server url to generate fiddlesticks error
+      Rails.configuration.arvados_v1_base = "https://[100::f]:1/"
+
+      visit page_with_token("active")
+
+      assert(page.has_text?(/fiddlesticks/i),
+             "Not on an error page after making an SSH key out of scope")
+
+      # check the "Report problem" button
+      assert page.has_link? 'Report problem'
+    ensure
+      Rails.configuration.arvados_v1_base = original_arvados_v1_base
+    end
+  end
+
 end

commit 213c5692b02c5014b211ad86808aa5f8a4f4f251
Author: radhika <radhika at curoverse.com>
Date:   Fri Aug 15 16:58:55 2014 -0400

    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 ae7dc22..7d15d95 100644
--- 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 10ffbb7..a9e9b7a 100644
--- 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>
+

commit 126421a50572468e5ddc0d979299c56cca7a5edd
Merge: 14f6c56 8864cde
Author: radhika <radhika at curoverse.com>
Date:   Fri Aug 15 16:44:46 2014 -0400

    Merge branch 'master' into 3112-report-bug


-----------------------------------------------------------------------


hooks/post-receive
--