diff --git a/server/src/uds/REST/methods/calendars.py b/server/src/uds/REST/methods/calendars.py index b32043d17..8af052a82 100644 --- a/server/src/uds/REST/methods/calendars.py +++ b/server/src/uds/REST/methods/calendars.py @@ -68,6 +68,9 @@ class Calendars(ModelHandler): }, {'comments': {'title': _('Comments')}}, {'modified': {'title': _('Modified'), 'type': 'datetime'}}, + {'number_rules': {'title': _('Rules')}}, + {'number_access': {'title': _('Pools with Accesses')}}, + {'number_actions': {'title': _('Pools with Actions')}}, {'tags': {'title': _('tags'), 'visible': False}}, ] @@ -78,6 +81,10 @@ class Calendars(ModelHandler): 'tags': [tag.tag for tag in item.tags.all()], 'comments': item.comments, 'modified': item.modified, + 'number_rules': item.rules.count(), + 'number_access': item.calendaraccess_set.all().values('service_pool').distinct().count(), + 'number_actions': item.calendaraction_set.all().values('service_pool').distinct().count(), + 'permission': permissions.getEffectivePermission(self._user, item), } diff --git a/server/src/uds/models/calendar.py b/server/src/uds/models/calendar.py index 768f57af1..599686df5 100644 --- a/server/src/uds/models/calendar.py +++ b/server/src/uds/models/calendar.py @@ -55,6 +55,7 @@ class Calendar(UUIDModel, TaggingMixin): objects: 'models.BaseManager[Calendar]' rules: 'models.QuerySet[CalendarRule]' calendaraction_set: 'models.QuerySet[CalendarAction]' + calendaraccess_set: 'models.QuerySet[CalendarAccess]' class Meta: """