From d4deb3c875d5819ed1992f81cad171d244eec1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexa=20Valentov=C3=A1?= <git@imaniti.org>
Date: Fri, 11 Oct 2024 10:32:09 +0200
Subject: [PATCH] fix minor errors
---
district/forms.py | 5 +++--
district/models.py | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/district/forms.py b/district/forms.py
index 3579fd46..beb5f055 100644
--- a/district/forms.py
+++ b/district/forms.py
@@ -44,11 +44,12 @@ class DistrictPeoplePageForm(WagtailAdminPageForm):
if collection_id is None:
collection_id = Collection.objects.first().id
- for shortcut in self.instance.get_syncable_octopus_groups():
+ for group in self.instance.get_syncable_octopus_groups():
import_people_from_group.delay(
self.instance.id,
collection_id,
- shortcut,
+ group["shortcut"],
+ group["title"],
)
return super().save(*args, **kwargs)
diff --git a/district/models.py b/district/models.py
index 9c393dfa..3afe7487 100644
--- a/district/models.py
+++ b/district/models.py
@@ -778,6 +778,9 @@ class DistrictPeoplePage(MainPeoplePageMixin):
# with them around, convert roles to lists only after we know the teams
# are unique.
for position, team in enumerate(unique_teams):
+ if team["roles"] is None:
+ continue
+
unique_teams[position]["roles"] = team["roles"].split(",")
return unique_teams
--
GitLab