diff --git a/src/c3nav/mapdata/models/access.py b/src/c3nav/mapdata/models/access.py index 4c27582c..975b1ae0 100644 --- a/src/c3nav/mapdata/models/access.py +++ b/src/c3nav/mapdata/models/access.py @@ -17,6 +17,8 @@ from c3nav.mapdata.models.base import SerializableMixin, TitledMixin class AccessRestriction(TitledMixin, models.Model): + new_serialize = True + """ An access restriction """ @@ -28,11 +30,6 @@ class AccessRestriction(TitledMixin, models.Model): verbose_name_plural = _('Access Restrictions') default_related_name = 'accessrestrictions' - def _serialize(self, **kwargs): - result = super()._serialize(**kwargs) - result['groups'] = tuple(group.pk for group in self.groups.all()) - return result - @classmethod def qs_for_request(cls, request): return cls.objects.filter(cls.q_for_request(request)) @@ -62,6 +59,8 @@ class AccessRestriction(TitledMixin, models.Model): class AccessRestrictionGroup(TitledMixin, models.Model): + new_serialize = True + """ An access restriction group """ @@ -188,7 +187,6 @@ class AccessPermissionToken(models.Model): class AccessPermissionSSOGrant(models.Model): - provider = models.CharField(max_length=32, verbose_name=_('SSO Backend')) group = models.CharField(max_length=64, verbose_name=_('SSO Group')) access_restriction = models.ForeignKey(AccessRestriction, on_delete=models.CASCADE, null=True, blank=True) diff --git a/src/c3nav/mapdata/schemas/models.py b/src/c3nav/mapdata/schemas/models.py index 6d6d88f3..129b252a 100644 --- a/src/c3nav/mapdata/schemas/models.py +++ b/src/c3nav/mapdata/schemas/models.py @@ -390,7 +390,7 @@ class AccessRestrictionSchema(TitledSchema, DjangoModelSchema): If they do, you can only see them if you have a permission to see objects with this access retriction. """ - open: bool + public: bool groups: list[PositiveInt] = APIField( title="access restriction groups" )