3112: modal is shown by js

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 f4f85513bfdfff6110b38e19e57cd298ac4ee796..e636550f7a614e259a1f33cf9446471829ced0a0 100644 (file)
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -23,7 +23,8 @@
   additional_info['api_error_response'] = @popup_params[:api_error_response] if @popup_params[:api_error_response]
 %>
 
-<div class="modal-dialog modal-with-loading-spinner">
+<div class="modal">
+ <div class="modal-dialog modal-with-loading-spinner">
   <div class="modal-content">
 
     <%= form_tag report_issue_path, {name: 'report-issue-form', method: 'post',
@@ -35,7 +36,7 @@
       %>
 
       <div class="modal-header">
-        <button type="button" class="close" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <div>
           <div class="col-sm-8"> <h4 class="modal-title"><%=title%></h4> </div>
           <div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
@@ -143,11 +144,13 @@
       <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>
-          <button class="btn btn-default report-issue-cancel" id="report-issue-cancel" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
+          <button class="btn btn-default report-issue-cancel" id="report-issue-cancel" data-dismiss="modal" aria-hidden="true">Cancel</button>
         <% else %>
-          <button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Close</button>
+          <button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
         <% end %>
       </div>
     <% end #form %>
   </div>
+ </div>
 </div>
+

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 59aedbcf6e585484983715753f55596f97df08e4..5c15db3d712425208353fd58647ff7b68f4f3c87 100644 (file)
--- a/apps/workbench/app/views/application/report_issue_popup.js.erb
+++ b/apps/workbench/app/views/application/report_issue_popup.js.erb
@@ -1,7 +1,2 @@
 $("#report-issue-modal-window").html("<%= escape_javascript(render partial: 'report_issue_popup') %>");
-
-// reset form input fields, for the next time around
-function reset_form() {
-  $('#report_issue_text').val("");
-  $('#additional_info').val("");
-}
+$("#report-issue-modal-window .modal").modal('show');

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index ec8cdf269c864703c680c464a28a0361153d8371..3f95be35de925582c7de0b33083baf3bae44db42 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -138,12 +138,12 @@
               <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.url, current_path: 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 %>
+                      {class: '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.url, current_path: 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 %>
+                      {class: 'report-issue-modal-window', :remote => true, return_to: request.url} do %>
                        <i class="fa fa-fw fa-support"></i> Report a problem ...
                       <% end %>
               </li>
@@ -213,4 +213,4 @@
   <%= yield :footer_html %>
 
 <div class="modal-container"></div>
-<div id="report-issue-modal-window" class="modal fade" role="dialog" aria-labelledby="report-issue-modal" aria-hidden="true"></div>
+<div id="report-issue-modal-window"></div>