From 0457a2efdf5dedb2525a0ac38250ab29c9f3155b Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Mon, 18 Jul 2022 13:48:53 +0200
Subject: [PATCH] WebUI component:
- Corrected templates to take into consideration new ConfigRules.
---
src/webui/service/templates/device/detail.html | 6 ++++--
src/webui/service/templates/service/detail.html | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/webui/service/templates/device/detail.html b/src/webui/service/templates/device/detail.html
index f27ac554b..b4cf6b715 100644
--- a/src/webui/service/templates/device/detail.html
+++ b/src/webui/service/templates/device/detail.html
@@ -75,13 +75,15 @@
<div class="col-sm-10">
<ul>
{% for config in device.device_config.config_rules %}
- <li>{{ config.resource_key }}:
+ {% if config.WhichOneof('config_rule') == 'custom' %}
+ <li>{{ config.custom.resource_key }}:
<ul>
- {% for key, value in (config.resource_value | from_json).items() %}
+ {% for key, value in (config.custom.resource_value | from_json).items() %}
<li><b>{{ key }}:</b> {{ value }}</li>
{% endfor %}
</ul>
</li>
+ {% endif %}
{% endfor %}
</ul>
</div>
diff --git a/src/webui/service/templates/service/detail.html b/src/webui/service/templates/service/detail.html
index b7c210c3f..1e58b9eaa 100644
--- a/src/webui/service/templates/service/detail.html
+++ b/src/webui/service/templates/service/detail.html
@@ -65,13 +65,15 @@
<div class="col-sm-10">
<ul>
{% for config in service.service_config.config_rules %}
- <li>{{ config.resource_key }}:
+ {% if config.WhichOneof('config_rule') == 'custom' %}
+ <li>{{ config.custom.resource_key }}:
<ul>
- {% for key, value in (config.resource_value | from_json).items() %}
+ {% for key, value in (config.custom.resource_value | from_json).items() %}
<li><b>{{ key }}:</b> {{ value }}</li>
{% endfor %}
</ul>
</li>
+ {% endif %}
{% endfor %}
</ul>
</div>
--
GitLab