[ARVADOS] updated: 9074f3f32aa13274f266bfb091bdac43426bb4d9
git at public.curoverse.com
git at public.curoverse.com
Wed Aug 20 11:59:56 EDT 2014
Summary of changes:
apps/workbench/app/mailers/issue_reporter.rb | 4 +--
.../views/application/_report_issue_popup.html.erb | 8 +++---
apps/workbench/app/views/layouts/body.html.erb | 4 +--
apps/workbench/config/application.default.yml | 6 ++---
doc/images/workbench-move-selected.png | Bin 0 -> 11267 bytes
.../getting_started/workbench.html.textile.liquid | 2 +-
doc/user/reference/api-tokens.html.textile.liquid | 8 +++---
...nning-pipeline-command-line.html.textile.liquid | 2 +-
doc/user/topics/tutorial-job1.html.textile.liquid | 4 +--
.../tutorial-firstscript.html.textile.liquid | 2 +-
.../tutorials/tutorial-keep.html.textile.liquid | 8 ++++--
...tutorial-pipeline-workbench.html.textile.liquid | 28 ++++++++++-----------
12 files changed, 40 insertions(+), 36 deletions(-)
create mode 100644 doc/images/workbench-move-selected.png
via 9074f3f32aa13274f266bfb091bdac43426bb4d9 (commit)
via d3be53db90fc31f13a477056b48a39dfa351ef5e (commit)
via 35a3223ee35279c04552d5d3d372998711a956ab (commit)
via 1a2947bd5c35d58a347111ad8a9f4fc50aa1d6b3 (commit)
via 57c56feabe58a4b49d0699c158086c13a5cdf023 (commit)
via 33755fab93fb604a5e663089ece0fe6d3f690fe4 (commit)
from e398326fea08b53a132086935d24be8dfde1cd47 (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 9074f3f32aa13274f266bfb091bdac43426bb4d9
Merge: d3be53d 35a3223
Author: radhika <radhika at curoverse.com>
Date: Wed Aug 20 11:40:49 2014 -0400
Merge branch 'master' into 3112-report-bug
commit d3be53db90fc31f13a477056b48a39dfa351ef5e
Author: radhika <radhika at curoverse.com>
Date: Wed Aug 20 11:39:58 2014 -0400
3112: update config param names for report notification
diff --git a/apps/workbench/app/mailers/issue_reporter.rb b/apps/workbench/app/mailers/issue_reporter.rb
index 5f3cf13..212dd7d 100644
--- a/apps/workbench/app/mailers/issue_reporter.rb
+++ b/apps/workbench/app/mailers/issue_reporter.rb
@@ -1,6 +1,6 @@
class IssueReporter < ActionMailer::Base
- default from: Rails.configuration.report_notifier_email_from
- default to: Rails.configuration.report_notifier_email_to
+ default from: Rails.configuration.issue_reporter_email_from
+ default to: Rails.configuration.issue_reporter_email_to
def send_report(user, params)
@user = user
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 2600593..e718ca8 100644
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -2,7 +2,7 @@
api_version = arvados_api_client.discovery[:source_version]
generated_at = arvados_api_client.discovery[:generatedAt]
wb_version = Rails.configuration.source_version
- wb_version += Rails.configuration.source_version if Rails.configuration.local_modified
+ wb_version += Rails.configuration.local_modified if Rails.configuration.local_modified
arvados_base = Rails.configuration.arvados_v1_base
support_email = Rails.configuration.support_email_address
@@ -43,7 +43,7 @@
<br/>
</div>
- <div class="modal-body">
+ <div class="modal-body" style="overflow-y:scroll">
<div class="form-group">
<label for="support_version" class="col-sm-4 control-label"> Support email </label>
<div class="col-sm-8">
@@ -92,8 +92,9 @@
<label for="additional_info" class="col-sm-4 control-label"> Additional info </label>
<div class="col-sm-8">
<textarea readonly class="form-control" rows="1" name="additional_info" type="text"><%=additional_info_str%></textarea>
+ </div>
+ <input type="hidden" name="report_additional_info" value="<%=additional_info.to_json%>">
</div>
- <input type="hidden" name="report_additional_info" value="<%=additional_info.to_json%>">
</div>
<div class="modal-footer">
@@ -104,7 +105,6 @@
<button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Close</button>
<% end %>
</div>
-
<% end #form %>
</div>
</div>
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index bedcf88..ded802b 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -139,12 +139,12 @@
<li role="presentation" class="divider"></li>
<li> <%= link_to report_issue_popup_path(popup_type: 'version', current_location: request.fullpath, 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
+ <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'),
{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
+ <i class="fa fa-fw fa-support"></i> Report a problem ...
<% end %>
</li>
</ul>
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 042f869..33ab2ce 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -137,7 +137,7 @@ common:
source_version: <%= `git log -n 1 --format=%h` %>
local_modified: false
- # report nitification to and from addresses
- report_notifier_email_from: arvados at example.com
- report_notifier_email_to: arvados at example.com
+ # report notification to and from addresses
+ issue_reporter_email_from: arvados at example.com
+ issue_reporter_email_to: arvados at example.com
support_email_address: arvados at example.com
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list