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 5f3cf13386a6e5f2516dd3ff6c65023047f5ee9d..212dd7dbf9b8e07aa4c1a2ce136a239fcbfe8682 100644 (file)
--- 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 260059395d2d52d2be724ac2f6d831b8646c8699..e718ca87276677aa3957bbfa1f45d1f7dbf92311 100644 (file)
--- 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 bedcf8846ef1fe2edca3b757601e2030cfaa7cb5..ded802bd7132b153cd199266b05dd2d24fc60da9 100644 (file)
--- 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 042f869168cf6fdaf6eb16c5294b0ca5c09673c6..33ab2ce5497d24a0ac0abea00944737f572fa4c8 100644 (file)
--- 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@example.com
-  report_notifier_email_to: arvados@example.com
+  # report notification to and from addresses
+  issue_reporter_email_from: arvados@example.com
+  issue_reporter_email_to: arvados@example.com
   support_email_address: arvados@example.com