[ARVADOS] updated: e8c9386ffbd11cfcbedb63fa1681d5c0590ba7a5
git at public.curoverse.com
git at public.curoverse.com
Mon Aug 25 16:32:51 EDT 2014
Summary of changes:
.../app/controllers/actions_controller.rb | 1 -
.../app/views/application/_report_error.html.erb | 2 +-
.../views/application/_report_issue_popup.html.erb | 44 +++++++++-------------
3 files changed, 19 insertions(+), 28 deletions(-)
via e8c9386ffbd11cfcbedb63fa1681d5c0590ba7a5 (commit)
from c6378b0e7da030652334366c8459ff3853811529 (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 e8c9386ffbd11cfcbedb63fa1681d5c0590ba7a5
Author: radhika <radhika at curoverse.com>
Date: Mon Aug 25 16:25:58 2014 -0400
3112: minor cleanup
diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index b889a0c..b230d78 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -182,7 +182,6 @@ class ActionsController < ApplicationController
end
def report_issue_popup
- @popup_params = params
respond_to do |format|
format.js
format.html
diff --git a/apps/workbench/app/views/application/_report_error.html.erb b/apps/workbench/app/views/application/_report_error.html.erb
index 0ad03cc..7ebfddb 100644
--- a/apps/workbench/app/views/application/_report_error.html.erb
+++ b/apps/workbench/app/views/application/_report_error.html.erb
@@ -17,5 +17,5 @@
<% 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&&body=Problem while viewing page <%=request.url%>"><%=support_email%></a>
</p>
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 afc66d3..a84fd48 100644
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -7,9 +7,8 @@
support_email = Rails.configuration.support_email_address
additional_info = {}
- additional_info['Current location'] = @popup_params[:current_location]
+ additional_info['Current location'] = params[:current_location]
additional_info['User UUID'] = current_user.uuid if current_user
- additional_info['User email'] = current_user.email if current_user
additional_info_str = additional_info.map {|k,v| "#{k}=#{v}"}.join("\n")
@@ -18,9 +17,9 @@
additional_info['workbench_version'] = wb_version
additional_info['arvados_base'] = arvados_base
additional_info['support_email'] = support_email
- additional_info['error_message'] = @popup_params[:error_message] if @popup_params[:error_message]
- additional_info['api_error_request_url'] = @popup_params[:api_error_request_url] if @popup_params[:api_error_request_url]
- additional_info['api_error_response'] = @popup_params[:api_error_response] if @popup_params[:api_error_response]
+ additional_info['error_message'] = params[:error_message] if params[:error_message]
+ additional_info['api_error_request_url'] = params[:api_error_request_url] if params[:api_error_request_url]
+ additional_info['api_error_response'] = params[:api_error_response] if params[:api_error_response]
%>
<div class="modal">
@@ -32,7 +31,7 @@
<%
title = 'Version / debugging info'
- title = 'Report a problem' if @popup_params[:popup_type] == 'report'
+ title = 'Report a problem' if params[:popup_type] == 'report'
%>
<div class="modal-header">
@@ -48,20 +47,20 @@
<div class="form-group">
<label for="support_email" class="col-sm-4 control-label"> Support email </label>
<div class="col-sm-8">
- <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>
+ <p class="form-control-static" name="support_version"><a href="mailto:<%=support_email%>?subject=Workbench problem report&body=Problem while viewing page <%=params[:current_location]%>"><%=support_email%></a></p>
</div>
</div>
<div class="form-group">
<label for="current_page" class="col-sm-4 control-label"> Current page </label>
<div class="col-sm-8">
- <p class="form-control-static text-overflow-ellipsis" name="current_page"><%=@popup_params[:current_path]%></a></p>
+ <p class="form-control-static text-overflow-ellipsis" name="current_page"><%=params[:current_path]%></a></p>
</div>
</div>
- <% if @popup_params[:popup_type] == 'report' %>
+ <% if params[:popup_type] == 'report' %>
<div class="form-group">
- <label for="report_text_label" class="col-sm-4 control-label"> Found a problem? Tell us what happened </label>
+ <label for="report_text_label" class="col-sm-4 control-label"> Describe the problem </label>
<div class="col-sm-8">
<textarea class="form-control" rows="4" id="report_issue_text" name="report_issue_text" type="text"/>
</div>
@@ -104,47 +103,40 @@
<p class="form-control-static" name="user_uuid"><%=current_user.uuid%></p>
</div>
</div>
-
- <div class="form-group">
- <label for="user_email" class="col-sm-4 control-label"> User email </label>
- <div class="col-sm-8">
- <p class="form-control-static" name="user_email"><%=current_user.email%></p>
- </div>
- </div>
<% end %>
- <% if @popup_params[:error_message] %>
+ <% if params[:error_message] %>
<div class="form-group">
<label for="error_message" class="col-sm-4 control-label"> Error message </label>
<div class="col-sm-8">
- <p class="form-control-static text-overflow-ellipsis" name="error_message"><%=@popup_params[:error_message]%></p>
+ <p class="form-control-static text-overflow-ellipsis" name="error_message"><%=params[:error_message]%></p>
</div>
</div>
<% end %>
- <% if @popup_params[:api_error_request_url] %>
+ <% if params[:api_error_request_url] %>
<div class="form-group">
- <label for="api_error_url" class="col-sm-4 control-label"> API error request url </label>
+ <label for="api_error_url" class="col-sm-4 control-label"> API error request URL </label>
<div class="col-sm-8">
- <p class="form-control-static text-overflow-ellipsis" name="api_error_url"><%=@popup_params[:api_error_request_url]%></p>
+ <p class="form-control-static text-overflow-ellipsis" name="api_error_url"><%=params[:api_error_request_url]%></p>
</div>
</div>
<% end %>
- <% if @popup_params[:api_error_response] %>
+ <% if params[:api_error_response] %>
<div class="form-group">
<label for="api_error_response" class="col-sm-4 control-label"> API error response </label>
<div class="col-sm-8">
- <p class="form-control-static text-overflow-ellipsis" name="api_error_response"><%=@popup_params[:api_error_response]%></p>
+ <p class="form-control-static text-overflow-ellipsis" name="api_error_response"><%=params[:api_error_response]%></p>
</div>
</div>
<% end %>
</div>
<div class="modal-footer">
- <% if @popup_params[:popup_type] == 'report' %>
- <button type="submit" id="report-issue-submit" class="btn btn-primary report-issue-submit" autofocus>Send problem report</button>
+ <% if params[:popup_type] == 'report' %>
<button class="btn btn-default report-issue-cancel" id="report-issue-cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
+ <button type="submit" id="report-issue-submit" class="btn btn-primary report-issue-submit" autofocus>Send problem report</button>
<% else %>
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list