diff --git a/src/webui/service/templates/device/detail.html b/src/webui/service/templates/device/detail.html index f27ac554b1c975039c2cb481c92debf47ba1591f..b4cf6b715250d3e96b5026c3e19758a2be9a9607 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 b7c210c3f3f9c7e3bf5a9b6311e0503d2e1d40e9..1e58b9eaad3155524808f60b49840edab7f17739 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>