openstack
/
manila-ui
Code Issues Proposed changes

Merge "Add share servers to share network detail"

This commit is contained in:
Zuul 2019-04-04 19:56:06 +00:00 committed by Gerrit Code Review
parent f04780b200 c8723091ed
commit 069003fc03
2 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
manila_ui/dashboards/project/share_networks/templates/share_networks/_detail.html
View File

@ -16,7 +16,7 @@
</div>
<div class="detail">
<h4>{% trans "Net Details" %}</h4>
<h4>{% trans "Network Details" %}</h4>
<hr class="header_rule">
<dl class="dl-horizontal">
<dt>{% trans "Network" %}</dt>
@ -31,19 +31,38 @@
</dl>
</div>
<div class="detail">
<h4>{% trans "Security Services" %}</h4>
<hr class="header_rule">
{% for sec_service in share_network.sec_services %}
{% url 'horizon:project:security_services:security_service_detail' sec_service.id as sec_service_url%}
<dl class="dl-horizontal">
<dt>{% trans "Id" %}</dt>
<dd><a href="{{ sec_service_url }}">{{ sec_service.id }}</a></dd>
<dt>{% trans "Name" %}</dt>
<dd><a href="{{ sec_service_url }}">{{ sec_service.name }}</a></dd>
<dt>{% trans "Type" %}</dt>
<dd>{{ sec_service.type }}</dd>
</dl>
<br />
{% endfor %}
</div>
{% if share_network.share_servers %}
<div class="detail">
<h4>{% trans "Share Servers" %}</h4>
<hr class="header_rule">
<dl class="dl-horizontal">
{% for server in share_network.share_servers %}
<ul>
{% url 'horizon:admin:share_servers:share_server_detail' server.id as server_url %}
<li><a href="{{ server_url }}">{{ server.id }}</a></li>
</ul>
{% endfor %}
</dl>
</div>
{% endif %}
{% if share_network.sec_services %}
<div class="detail">
<h4>{% trans "Security Services" %}</h4>
<hr class="header_rule">
{% for sec_service in share_network.sec_services %}
{% url 'horizon:project:security_services:security_service_detail' sec_service.id as sec_service_url%}
<dl class="dl-horizontal">
<dt>{% trans "Id" %}</dt>
<dd><a href="{{ sec_service_url }}">{{ sec_service.id }}</a></dd>
<dt>{% trans "Name" %}</dt>
<dd><a href="{{ sec_service_url }}">{{ sec_service.name }}</a></dd>
<dt>{% trans "Type" %}</dt>
<dd>{{ sec_service.type }}</dd>
</dl>
<br />
{% endfor %}
</div>
{% endif %}

6
releasenotes/notes/bug-1702396-add-share-servers-to-share-network-details-1cff66010817f1a8.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Share servers are added to the share network details page. The page has
been modified to show share servers and security services only if any
exist, or are retrievable from the server.