From d2cb797ebbd04b3325dc47b383aa5254f674e0c1 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke.madsen@geant.org>
Date: Mon, 12 Apr 2021 17:55:00 +0200
Subject: [PATCH] Add missing commas and GEANTOPEN to public

---
 brian_dashboard_manager/config.py            | 9 +++++----
 brian_dashboard_manager/grafana/dashboard.py | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/brian_dashboard_manager/config.py b/brian_dashboard_manager/config.py
index c4d1dba..85adb88 100644
--- a/brian_dashboard_manager/config.py
+++ b/brian_dashboard_manager/config.py
@@ -67,9 +67,9 @@ DEFAULT_ORGANIZATIONS = [
         "excluded_dashboards": [
             "GÉANT Office devices",
             "GÉANT VM",
-            "Lab Devices"
+            "Lab Devices",
             "IAS",
-            "GEANTOPEN",
+            "GÉANT Open",
             "IAS Peers"
         ],
         "excluded_folders": {
@@ -78,7 +78,8 @@ DEFAULT_ORGANIZATIONS = [
             "IAS PRIVATE": True,
             "IAS PUBLIC": True,
             "IAS UPSTREAM": True,
-            "GWS PHY Upstream": True
+            "GWS PHY Upstream": True,
+            "GEANTOPEN" : True,
         }
     },
     {
@@ -106,7 +107,7 @@ DEFAULT_ORGANIZATIONS = [
         "excluded_dashboards": [
             "GÉANT Office devices",
             "GÉANT VM",
-            "Lab Devices"
+            "Lab Devices",
             "IAS",
             "IAS Peers"
         ],
diff --git a/brian_dashboard_manager/grafana/dashboard.py b/brian_dashboard_manager/grafana/dashboard.py
index 4b0fba7..5b11704 100644
--- a/brian_dashboard_manager/grafana/dashboard.py
+++ b/brian_dashboard_manager/grafana/dashboard.py
@@ -30,7 +30,9 @@ def delete_dashboard(request: TokenRequest, dashboard, folder_id=None):
         uid = dashboard.get('uid')
         if uid:
             return _delete_dashboard(request, uid)
-        elif dashboard.get('title') and folder_id:
+        elif dashboard.get('title'):
+            # if a folder ID is not supplied,
+            # dashboard title should be globally unique
             dash = _search_dashboard(request, dashboard, folder_id)
             if dash is None:
                 return True
-- 
GitLab