From 8a1308394fe1b52e45c7d117690bcf0580a931da Mon Sep 17 00:00:00 2001
From: Samuel Roberts <sam.roberts@geant.org>
Date: Fri, 9 Feb 2024 12:41:32 +0000
Subject: [PATCH] fix ipv6 panel section showing up where it shouldn't
---
brian_dashboard_manager/templating/helpers.py | 29 ++++++++++---------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/brian_dashboard_manager/templating/helpers.py b/brian_dashboard_manager/templating/helpers.py
index 6426eb7..5f7a44e 100644
--- a/brian_dashboard_manager/templating/helpers.py
+++ b/brian_dashboard_manager/templating/helpers.py
@@ -607,24 +607,25 @@ def get_nren_dashboard_data_single(data, datasource, tag):
iface_dropdown = create_dropdown_panel('Interfaces', **next(gridPos))
phys_panels = panel_gen(dash['PHYSICAL'], datasource, True)
+ dropdown_groups = [{
+ 'dropdown': services_dropdown,
+ 'panels': service_panels,
+ }]
+ if len(service_ipv6_panels) > 0:
+ dropdown_groups.append({
+ 'dropdown': services_ipv6_dropdown,
+ 'panels': service_ipv6_panels
+ })
+ dropdown_groups.append({
+ 'dropdown': iface_dropdown,
+ 'panels': phys_panels,
+ })
+
result = {
'nren_name': nren,
'datasource': datasource,
'aggregate_panels': agg_panels,
- 'dropdown_groups': [
- {
- 'dropdown': services_dropdown,
- 'panels': service_panels,
- },
- {
- 'dropdown': services_ipv6_dropdown,
- 'panels': service_ipv6_panels
- },
- {
- 'dropdown': iface_dropdown,
- 'panels': phys_panels,
- }
- ]
+ 'dropdown_groups': dropdown_groups
}
if isinstance(tag, list):
result['tags'] = tag
--
GitLab