Merge branch '8784-dir-listings'

[arvados.git] / apps / workbench / app / views / application / _report_issue_popup.html.erb

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 fbb7a117582e7f527cb1c9266d98df14a543c8c4..86d550a33f34dc8bbccceb556164c76c5bf8a03b 100644 (file)
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -1,8 +1,9 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
 <%
-  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.local_modified if Rails.configuration.local_modified
   arvados_base = Rails.configuration.arvados_v1_base
   support_email = Rails.configuration.support_email_address
 
@@ -12,9 +13,9 @@
 
   additional_info_str = additional_info.map {|k,v| "#{k}=#{v}"}.join("\n")
 
-  additional_info['api_version'] = api_version
+  additional_info['api_source_version'] = api_source_version
   additional_info['generated_at'] = generated_at
-  additional_info['workbench_version'] = wb_version
+  additional_info['workbench_version'] = AppVersion.hash
   additional_info['arvados_base'] = arvados_base
   additional_info['support_email'] = support_email
   additional_info['error_message'] = params[:error_message] if params[:error_message]
@@ -27,7 +28,7 @@
   <div class="modal-content">
 
     <%= form_tag report_issue_path, {name: 'report-issue-form', method: 'post',
-        class: 'form-horizontal', remote: true} do %>
+        class: 'form-horizontal'} do %>
 
       <%
         title = 'Version / debugging info'
@@ -43,7 +44,7 @@
         <br/>
       </div>
 
-      <div class="modal-body" style="overflow-y:auto">
+      <div class="modal-body" style="height: 25em; overflow-y: scroll">
         <div class="form-group">
           <label for="support_email" class="col-sm-4 control-label"> Support email </label>
           <div class="col-sm-8">
@@ -62,35 +63,39 @@
           <div class="form-group">
             <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"/>
+              <textarea class="form-control" rows="4" id="report_issue_text" name="report_issue_text" type="text" placeholder="Describe the problem"/>
             </div>
             <input type="hidden" name="report_additional_info" value="<%=additional_info.to_json%>">
           </div>
         <% end %>
 
         <div class="form-group">
-          <label for="server_version" class="col-sm-4 control-label"> API version </label>
+          <label for="wb_version" class="col-sm-4 control-label"> Workbench version </label>
           <div class="col-sm-8">
-            <p class="form-control-static" name="server_version"><%=api_version%></p>
+            <p class="form-control-static" name="wb_version">
+              <%= link_to AppVersion.hash, version_link_target(AppVersion.hash) %>
+            </p>
           </div>
         </div>
 
         <div class="form-group">
-          <label for="generated_at" class="col-sm-4 control-label"> API startup time </label>
+          <label for="server_version" class="col-sm-4 control-label"> API version </label>
           <div class="col-sm-8">
-            <p class="form-control-static" name="generated_at"><%=generated_at%></p>
+            <p class="form-control-static" name="server_version">
+              <%= link_to api_source_version, version_link_target(api_source_version) %>
+            </p>
           </div>
         </div>
 
         <div class="form-group">
-          <label for="wb_version" class="col-sm-4 control-label"> Workbench version </label>
+          <label for="generated_at" class="col-sm-4 control-label"> API startup time </label>
           <div class="col-sm-8">
-            <p class="form-control-static" name="wb_version"><%=wb_version%></p>
+            <p class="form-control-static" name="generated_at"><%=generated_at%></p>
           </div>
         </div>
 
         <div class="form-group">
-          <label for="arvados_base" class="col-sm-4 control-label"> Workbench URI </label>
+          <label for="arvados_base" class="col-sm-4 control-label"> API address </label>
           <div class="col-sm-8">
             <p class="form-control-static" name="arvados_base"><%=arvados_base%></p>
           </div>