projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14946-ruby-2.5
[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..8823fdd5f78f8ebfe7c4a336c3a144bc479de26f 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]
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
arvados_base = Rails.configuration.arvados_v1_base
support_email = Rails.configuration.support_email_address
@@
-12,9
+13,11
@@
additional_info_str = additional_info.map {|k,v| "#{k}=#{v}"}.join("\n")
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['api_package_version'] = api_package_version
additional_info['generated_at'] = generated_at
additional_info['generated_at'] = generated_at
- additional_info['workbench_version'] = wb_version
+ additional_info['workbench_version'] = AppVersion.hash
+ additional_info['workbench_package_version'] = AppVersion.package_version
additional_info['arvados_base'] = arvados_base
additional_info['support_email'] = support_email
additional_info['error_message'] = params[:error_message] if params[:error_message]
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
+30,7
@@
<div class="modal-content">
<%= form_tag report_issue_path, {name: 'report-issue-form', method: 'post',
<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'
<%
title = 'Version / debugging info'
@@
-43,7
+46,7
@@
<br/>
</div>
<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">
<div class="form-group">
<label for="support_email" class="col-sm-4 control-label"> Support email </label>
<div class="col-sm-8">
@@
-62,35
+65,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">
<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">
</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">
<div class="col-sm-8">
- <p class="form-control-static" name="server_version"><%=api_version%></p>
+ <p class="form-control-static" name="wb_version">
+ <%= AppVersion.package_version %> (<%= link_to AppVersion.hash, version_link_target(AppVersion.hash) %>)
+ </p>
</div>
</div>
<div class="form-group">
</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">
<div class="col-sm-8">
- <p class="form-control-static" name="generated_at"><%=generated_at%></p>
+ <p class="form-control-static" name="server_version">
+ <%= api_package_version %> (<%= link_to api_source_version, version_link_target(api_source_version) %>)
+ </p>
</div>
</div>
<div class="form-group">
</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">
<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">
</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>
<div class="col-sm-8">
<p class="form-control-static" name="arvados_base"><%=arvados_base%></p>
</div>