shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-03-20 06:50:23 +03:00
Code Issues Releases Wiki Activity

Refactor owner_id filtering logic and enhance pool field definition in UsageSummaryByUsersPool

Browse Source
This commit is contained in:
Adolfo Gómez García 2025-01-10 16:48:33 +01:00
parent 735ccd22c0
commit 5d2ae3285c
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/uds/models/stats_events.py
View File

@ -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):

9
server/src/uds/reports/stats/pool_users_summary.py
View File

@ -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