[ARVADOS] updated: b56386aab9f0cddde9727d4e76fb28aae8b442c7

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/actions_controller.rb           | 2 +-
 apps/workbench/app/views/application/_report_error.html.erb    | 6 +++---
 apps/workbench/app/views/application/report_issue.js.erb       | 1 -
 apps/workbench/app/views/application/report_issue_popup.js.erb | 4 ----
 4 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 apps/workbench/app/views/application/report_issue.js.erb

       via  b56386aab9f0cddde9727d4e76fb28aae8b442c7 (commit)
      from  58b6e6889cf9f9b108fe4a6ba7a100713bedbab9 (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 b56386aab9f0cddde9727d4e76fb28aae8b442c7
Author: radhika <radhika at curoverse.com>
Date:   Tue Aug 26 11:32:59 2014 -0400

    3112: no need to reload after sending report.

diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 2d23f07..c815ba9 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -176,7 +176,7 @@ class ActionsController < ApplicationController
 
     respond_to do |format|
       IssueReporter.send_report(current_user, params).deliver
-      format.js
+      format.js {render nothing: true}
     end
   end
 
diff --git a/apps/workbench/app/views/application/_report_error.html.erb b/apps/workbench/app/views/application/_report_error.html.erb
index 7ebfddb..8ab1d89 100644
--- a/apps/workbench/app/views/application/_report_error.html.erb
+++ b/apps/workbench/app/views/application/_report_error.html.erb
@@ -6,16 +6,16 @@
     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 %>
+        {class: 'btn btn-primary 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, 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 %>
+        {class: 'btn btn-primary 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, send email 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&body=Problem while viewing page <%=request.url%>"><%=support_email%></a>
 </p>
diff --git a/apps/workbench/app/views/application/report_issue.js.erb b/apps/workbench/app/views/application/report_issue.js.erb
deleted file mode 100644
index 26113a9..0000000
--- a/apps/workbench/app/views/application/report_issue.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-// Let ajax events handle hiding of the popup.
diff --git a/apps/workbench/app/views/application/report_issue_popup.js.erb b/apps/workbench/app/views/application/report_issue_popup.js.erb
index 5cfe502..5c15db3 100644
--- a/apps/workbench/app/views/application/report_issue_popup.js.erb
+++ b/apps/workbench/app/views/application/report_issue_popup.js.erb
@@ -1,6 +1,2 @@
 $("#report-issue-modal-window").html("<%= escape_javascript(render partial: 'report_issue_popup') %>");
 $("#report-issue-modal-window .modal").modal('show');
-
-$('#report-issue-modal-window').on('hidden.bs.modal', function () {
- location.reload();
-})

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


hooks/post-receive
--