diff --git a/iotronic_ui/iot/boards/tables.py b/iotronic_ui/iot/boards/tables.py index 654d7f2..18d15cb 100644 --- a/iotronic_ui/iot/boards/tables.py +++ b/iotronic_ui/iot/boards/tables.py @@ -181,11 +181,12 @@ class BoardsTable(tables.DataTable): verbose_name=_('Board Name')) type = tables.Column('type', verbose_name=_('Type')) # 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_name = tables.Column('fleet_name', verbose_name=_('Fleet Name')) # code = tables.Column('code', verbose_name=_('Code')) status = tables.Column('status', verbose_name=_('Status')) + uuid = tables.Column('uuid', verbose_name=_('Board ID')) # location = tables.Column('location', verbose_name=_('Geo')) services = tables.Column(show_services, verbose_name=_('Services')) # extra = tables.Column('extra', verbose_name=_('Extra')) diff --git a/iotronic_ui/iot/boards/templates/boards/_detail_overview.html b/iotronic_ui/iot/boards/templates/boards/_detail_overview.html index 241725b..1f2c458 100644 --- a/iotronic_ui/iot/boards/templates/boards/_detail_overview.html +++ b/iotronic_ui/iot/boards/templates/boards/_detail_overview.html @@ -13,6 +13,10 @@
{{ board.type }}
{% trans "ID" %}
{{ board.uuid }}
+
{% trans "MAC" %}
+
{{ board.mac_addr }}
+
{% trans "LR version" %}
+
{{ board.lr_version }}
{% trans "Code" %}
{{ board.code }}
{% trans "Creation data" %}
@@ -49,8 +53,10 @@
{% if services %} {% for service in services %} -
{{ service.name }} [{{ service.protocol }}] {{ service.port }}
-
{{ service.public_port }}
+ + +
{{ service.name }}
+
[{{ service.protocol }}] L: {{ service.port }}; P: {{ service.public_port }}
{% endfor %} {% else %}
--
diff --git a/iotronic_ui/iot/webservices/forms.py b/iotronic_ui/iot/webservices/forms.py index b3d1c40..5ddf696 100644 --- a/iotronic_ui/iot/webservices/forms.py +++ b/iotronic_ui/iot/webservices/forms.py @@ -44,7 +44,8 @@ class ExposeWebserviceForm(forms.SelfHandlingForm): 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): super(ExposeWebserviceForm, self).__init__(*args, **kwargs) diff --git a/iotronic_ui/iot/webservices/templates/webservices/_cell_webservices.html b/iotronic_ui/iot/webservices/templates/webservices/_cell_webservices.html index 2040153..9a62bc1 100644 --- a/iotronic_ui/iot/webservices/templates/webservices/_cell_webservices.html +++ b/iotronic_ui/iot/webservices/templates/webservices/_cell_webservices.html @@ -1,7 +1,7 @@ {% load i18n %} {% if webservices %} {% for ws in webservices %} -
{{ ws.service_url}}
+
[ {{ ws.local_port }} ] - {{ ws.service_url }}
{% endfor %} {% else %}
--
diff --git a/iotronic_ui/iot/webservices/views.py b/iotronic_ui/iot/webservices/views.py index 32a59ad..8d97fe1 100644 --- a/iotronic_ui/iot/webservices/views.py +++ b/iotronic_ui/iot/webservices/views.py @@ -86,8 +86,10 @@ class IndexView(tables.DataTableView): for ws in webservices: if ws_en.board_uuid == ws.board_uuid: - service_url = "https://" + ws.name + "." + ws_en.dns + "." + ws_en.zone - ws_list.append({"service_url": service_url}) + service_url = "https://" + ws.name + "." + ws_en.dns +\ + "." + ws_en.zone + ws_list.append({"local_port": ws.port, + "service_url": service_url}) ws_en.uuid = ws.uuid @@ -95,7 +97,6 @@ class IndexView(tables.DataTableView): ws_en.name = board.name ws_en._info.update(dict(webservices=ws_list)) - # LOG.debug('WS: %s', en_webservices) return en_webservices