Added new fields in tables and restyled services strings
Change-Id: I668538c1b0d45d0cabd85f0a7042d6143222bb1c
This commit is contained in:
parent
ea836e1cfb
commit
b0324c020b
|
@ -181,11 +181,12 @@ class BoardsTable(tables.DataTable):
|
||||||
verbose_name=_('Board Name'))
|
verbose_name=_('Board Name'))
|
||||||
type = tables.Column('type', verbose_name=_('Type'))
|
type = tables.Column('type', verbose_name=_('Type'))
|
||||||
# mobile = tables.Column('mobile', verbose_name=_('Mobile'))
|
# mobile = tables.Column('mobile', verbose_name=_('Mobile'))
|
||||||
uuid = tables.Column('uuid', verbose_name=_('Board ID'))
|
lr_version = tables.Column('lr_version', verbose_name=_('LR version'))
|
||||||
# fleet = tables.Column('fleet', verbose_name=_('Fleet ID'))
|
# fleet = tables.Column('fleet', verbose_name=_('Fleet ID'))
|
||||||
fleet_name = tables.Column('fleet_name', verbose_name=_('Fleet Name'))
|
fleet_name = tables.Column('fleet_name', verbose_name=_('Fleet Name'))
|
||||||
# code = tables.Column('code', verbose_name=_('Code'))
|
# code = tables.Column('code', verbose_name=_('Code'))
|
||||||
status = tables.Column('status', verbose_name=_('Status'))
|
status = tables.Column('status', verbose_name=_('Status'))
|
||||||
|
uuid = tables.Column('uuid', verbose_name=_('Board ID'))
|
||||||
# location = tables.Column('location', verbose_name=_('Geo'))
|
# location = tables.Column('location', verbose_name=_('Geo'))
|
||||||
services = tables.Column(show_services, verbose_name=_('Services'))
|
services = tables.Column(show_services, verbose_name=_('Services'))
|
||||||
# extra = tables.Column('extra', verbose_name=_('Extra'))
|
# extra = tables.Column('extra', verbose_name=_('Extra'))
|
||||||
|
|
|
@ -13,6 +13,10 @@
|
||||||
<dd>{{ board.type }}</dd>
|
<dd>{{ board.type }}</dd>
|
||||||
<dt>{% trans "ID" %}</dt>
|
<dt>{% trans "ID" %}</dt>
|
||||||
<dd>{{ board.uuid }}</dd>
|
<dd>{{ board.uuid }}</dd>
|
||||||
|
<dt>{% trans "MAC" %}</dt>
|
||||||
|
<dd>{{ board.mac_addr }}</dd>
|
||||||
|
<dt>{% trans "LR version" %}</dt>
|
||||||
|
<dd>{{ board.lr_version }}</dd>
|
||||||
<dt>{% trans "Code" %}</dt>
|
<dt>{% trans "Code" %}</dt>
|
||||||
<dd>{{ board.code }}</dd>
|
<dd>{{ board.code }}</dd>
|
||||||
<dt>{% trans "Creation data" %}</dt>
|
<dt>{% trans "Creation data" %}</dt>
|
||||||
|
@ -49,8 +53,10 @@
|
||||||
<dl class="dl-horizontal">
|
<dl class="dl-horizontal">
|
||||||
{% if services %}
|
{% if services %}
|
||||||
{% for service in services %}
|
{% for service in services %}
|
||||||
<dt>{{ service.name }} [{{ service.protocol }}] {{ service.port }}</dt>
|
<!--<dt>{{ service.name }} [{{ service.protocol }}] {{ service.port }}</dt>-->
|
||||||
<dd>{{ service.public_port }}</dd>
|
<!--<dd>{{ service.public_port }}</dd>-->
|
||||||
|
<dt>{{ service.name }}</dt>
|
||||||
|
<dd>[{{ service.protocol }}] L: {{ service.port }}; P: {{ service.public_port }}</dd>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<dd>--</dd>
|
<dd>--</dd>
|
||||||
|
|
|
@ -44,7 +44,8 @@ class ExposeWebserviceForm(forms.SelfHandlingForm):
|
||||||
help_text=_("The local port used by the service")
|
help_text=_("The local port used by the service")
|
||||||
)
|
)
|
||||||
|
|
||||||
secure = forms.BooleanField(label=_("Secure"), initial=True)
|
secure = forms.BooleanField(label=_("Secure"), initial=True,
|
||||||
|
widget=forms.HiddenInput)
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super(ExposeWebserviceForm, self).__init__(*args, **kwargs)
|
super(ExposeWebserviceForm, self).__init__(*args, **kwargs)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% if webservices %}
|
{% if webservices %}
|
||||||
{% for ws in webservices %}
|
{% for ws in webservices %}
|
||||||
<dd><a target="_blank" href="{{ ws.service_url}}">{{ ws.service_url}}</a></dd>
|
<dd>[ {{ ws.local_port }} ] - <a target="_blank" href="{{ ws.service_url }}">{{ ws.service_url }}</a></dd>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<dd>--</dd>
|
<dd>--</dd>
|
||||||
|
|
|
@ -86,8 +86,10 @@ class IndexView(tables.DataTableView):
|
||||||
for ws in webservices:
|
for ws in webservices:
|
||||||
if ws_en.board_uuid == ws.board_uuid:
|
if ws_en.board_uuid == ws.board_uuid:
|
||||||
|
|
||||||
service_url = "https://" + ws.name + "." + ws_en.dns + "." + ws_en.zone
|
service_url = "https://" + ws.name + "." + ws_en.dns +\
|
||||||
ws_list.append({"service_url": service_url})
|
"." + ws_en.zone
|
||||||
|
ws_list.append({"local_port": ws.port,
|
||||||
|
"service_url": service_url})
|
||||||
|
|
||||||
ws_en.uuid = ws.uuid
|
ws_en.uuid = ws.uuid
|
||||||
|
|
||||||
|
@ -95,7 +97,6 @@ class IndexView(tables.DataTableView):
|
||||||
ws_en.name = board.name
|
ws_en.name = board.name
|
||||||
ws_en._info.update(dict(webservices=ws_list))
|
ws_en._info.update(dict(webservices=ws_list))
|
||||||
|
|
||||||
# LOG.debug('WS: %s', en_webservices)
|
|
||||||
return en_webservices
|
return en_webservices
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue