Merge tag '5.2.0' into develop

5.2.0
CentreForDigitalHumanities · Oct 31, 2023 · bd80d18 · bd80d18
2 parents e9380ee + aaa34e8
commit bd80d18
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -35,5 +35,5 @@ keywords:
   - elasticsearch
   - natural language processing
 license: MIT
-version: 4.2.0
-date-released: '2023-09-28'
+version: 5.2.0
+date-released: '2023-10-31'
diff --git a/backend/users/migrations/0005_saml_user_group.py b/backend/users/migrations/0005_saml_user_group.py
@@ -9,7 +9,7 @@ def add_saml_users_to_group(apps, schema_editor):
 
     if saml_group:
         for user in saml_users:
-            user.groups.add(saml_group)
+            user.groups.add(saml_group.id)
             user.save()
 
 class Migration(migrations.Migration):

diff --git a/backend/users/saml.py b/backend/users/saml.py
@@ -16,4 +16,5 @@ def get_or_create_user(self, *args, **kwargs):
 def saml_user_group():
     group_name = getattr(settings, 'SAML_GROUP_NAME', None)
     if group_name:
-        return Group.objects.get_or_create(name=group_name)
+        group, _ = Group.objects.get_or_create(name=group_name)
+        return group
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "i-analyzer",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "license": "MIT",
   "scripts": {
     "postinstall": "yarn install-back && yarn install-front",