Merge pull request #42 from eea/develop

Fix typo in two role ids
eea · Nov 22, 2021 · 923f11b · 923f11b
2 parents a269ca8 + fbfce1b
commit 923f11b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+3.5 - (2021-11-22)
+---------------------------
+* fix typo in role id
+  [valipod]
+
 3.4 - (2021-11-19)
 ---------------------------
 * fix PCP incorrectly shown on all sibling roles

diff --git a/eea/ldapadmin/constants.py b/eea/ldapadmin/constants.py
@@ -80,8 +80,8 @@
     "eionet-biodiversity1",
     "eionet-biodiversity2",
     "eionet-circulareconomy",
-    "eionet-climatecangeadaptation"
-    "eionet-clmatechangemitigation",
+    "eionet-climatechangeadaptation",
+    "eionet-climatechangemitigation",
     "eionet-communication",
     "eionet-data",
     "eionet-foodsystems",

diff --git a/eea/ldapadmin/nfp_nrc.py b/eea/ldapadmin/nfp_nrc.py
@@ -75,9 +75,9 @@ class SimplifiedRole(object):
 
     def __init__(self, role_id, description):
         group = re.match(
-            r'^eionet-(biodiversity1|biodiversity2|climatechange|health|'
-            r'circulareconomy|foresight|soe|foodsystems|landsystems|mobility|'
-            r'data|communication)(.*)-([^-]*)$',
+            r'^eionet-(biodiversity|climatechange|health|circulareconomy|'
+            r'foresight|soe|foodsystems|landsystems|mobility|data|'
+            r'communication)(.*)-([^-]*)$',
             role_id, re.IGNORECASE)
         nfp = re.match(
             r'^eionet-nfp-(.*)(mc|cc|oc)-([^-]*)$',

diff --git a/eea/ldapadmin/version.txt b/eea/ldapadmin/version.txt
@@ -1 +1 @@
-3.4
+3.5