[ARVADOS] updated: ecc16570f7b336c7cd3a4b77876db8e6d4ed4fad
git at public.curoverse.com
git at public.curoverse.com
Wed Aug 20 17:26:41 EDT 2014
Summary of changes:
.../app/controllers/actions_controller.rb | 3 +-
apps/workbench/app/views/application/404.html.erb | 9 +----
.../views/application/_report_issue_popup.html.erb | 2 +-
.../app/views/application/api_error.html.erb | 15 +--------
apps/workbench/app/views/layouts/body.html.erb | 4 +--
.../create-standard-objects.html.textile.liquid | 25 ++++++++++----
sdk/python/tests/run_test_server.py | 39 ++++++++++++----------
7 files changed, 47 insertions(+), 50 deletions(-)
via ecc16570f7b336c7cd3a4b77876db8e6d4ed4fad (commit)
via 45f82943a6740bc95614851890ce3ba1dcaee41b (commit)
via 96fefe2373e7965311e1376dc0a54cf16ec9b415 (commit)
via 9beaaf14365459a028ca647488822f31bc2a26a9 (commit)
via cf9e77519d9955a2c8514e229dff099775d06af8 (commit)
from 3e443d57aaecd34e63a8d861c7075ab7b0f61174 (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 ecc16570f7b336c7cd3a4b77876db8e6d4ed4fad
Merge: 45f8294 96fefe2
Author: radhika <radhika at curoverse.com>
Date: Wed Aug 20 17:26:31 2014 -0400
Merge branch 'master' into 3112-report-bug
commit 45f82943a6740bc95614851890ce3ba1dcaee41b
Author: radhika <radhika at curoverse.com>
Date: Wed Aug 20 17:23:52 2014 -0400
3112: use partial to report error
diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 952f9dc..939cac3 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -187,8 +187,7 @@ class ActionsController < ApplicationController
end
def report_issue
- $stderr.puts "Issue being reported with these parameters: #{params.inspect}"
- logger.warn "Issue being reported with these parameters: #{params.inspect}"
+ logger.warn "report_issue: #{params.inspect}"
respond_to do |format|
IssueReporter.send_report(current_user, params).deliver
diff --git a/apps/workbench/app/views/application/404.html.erb b/apps/workbench/app/views/application/404.html.erb
index 7d15d95..84af5d3 100644
--- a/apps/workbench/app/views/application/404.html.erb
+++ b/apps/workbench/app/views/application/404.html.erb
@@ -21,12 +21,5 @@ Perhaps you'd like to
</p>
-<p>
-<br/>
<% error_message = "The #{req_item_plain_text} was not found." %>
-<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
-<% end %>
-</p>
+<%= render :partial => "report_error", :locals => {error_message: error_message} %>
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 e718ca8..4b2b55a 100644
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -47,7 +47,7 @@
<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" name="support_version"><%=support_email%></p>
+ <p class="form-control-static" name="support_version"><a href="mailto:<%=support_email%>?subject=Workbench problem report&body=Problem while viewing page <%=@popup_params[:current_location]%>"><%=support_email%></a></p>
</div>
</div>
diff --git a/apps/workbench/app/views/application/api_error.html.erb b/apps/workbench/app/views/application/api_error.html.erb
index 68fe32b..9fcfde6 100644
--- a/apps/workbench/app/views/application/api_error.html.erb
+++ b/apps/workbench/app/views/application/api_error.html.erb
@@ -22,17 +22,4 @@ If that doesn't work, the information below can help system administrators track
</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>
+<%= render :partial => "report_error", :locals => {api_error: api_error} %>
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index ded802b..9bfd12c 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -137,12 +137,12 @@
<li><%= link_to raw('<i class="fa fa-book fa-fw"></i> API Reference'), "#{Rails.configuration.arvados_docsite}/api", target: "_blank" %></li>
<li><%= link_to raw('<i class="fa fa-book fa-fw"></i> SDK Reference'), "#{Rails.configuration.arvados_docsite}/sdk", target: "_blank" %></li>
<li role="presentation" class="divider"></li>
- <li> <%= link_to report_issue_popup_path(popup_type: 'version', current_location: request.fullpath, action_method: 'post'),
+ <li> <%= link_to report_issue_popup_path(popup_type: 'version', current_location: request.url, action_method: 'post'),
{class: '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> Show version / debugging info ...
<% end %>
</li>
- <li> <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.fullpath, action_method: 'post'),
+ <li> <%= link_to report_issue_popup_path(popup_type: 'report', current_location: request.url, action_method: 'post'),
{class: '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 a problem ...
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list