diff --git a/server/src/uds/models/stats_events.py b/server/src/uds/models/stats_events.py index 43902a332..65b2b98c2 100644 --- a/server/src/uds/models/stats_events.py +++ b/server/src/uds/models/stats_events.py @@ -96,7 +96,7 @@ class StatsEvents(models.Model): if isinstance(owner_id, int): q = q.filter(owner_id=owner_id) - else: + elif owner_id is not None: q = q.filter(owner_id__in=owner_id) if isinstance(since, datetime.datetime): diff --git a/server/src/uds/reports/stats/pool_users_summary.py b/server/src/uds/reports/stats/pool_users_summary.py index 4a884d4b9..5cf7977dc 100644 --- a/server/src/uds/reports/stats/pool_users_summary.py +++ b/server/src/uds/reports/stats/pool_users_summary.py @@ -37,6 +37,7 @@ import typing from django.utils.translation import gettext from django.utils.translation import gettext_lazy as _ +from uds.core import ui from uds.core.managers.stats import StatsManager from uds.core.ui import gui from uds.core.util.stats import events @@ -55,7 +56,13 @@ class UsageSummaryByUsersPool(StatsReport): # UserInterface will ignore all fields that are not from FINAL class # so we must redeclare them here - pool = StatsReport.pool + pool = ui.gui.ChoiceField( + order=1, + label=_('Pool'), + tooltip=_('Pool for report'), + required=True, + ) + start_date = StatsReport.start_date end_date = StatsReport.end_date