fix: include admin in personal payout fallback

This commit is contained in:
2026-04-21 21:43:36 +02:00
parent 8bf37c82b6
commit e0dadc4b20
2 changed files with 14 additions and 2 deletions
+2 -1
View File
@@ -34,7 +34,8 @@ def active_users() -> list[User]:
def personal_users() -> list[User]: def personal_users() -> list[User]:
users = active_users() users = active_users()
non_admin = [user for user in users if not user.is_admin()] non_admin = [user for user in users if not user.is_admin()]
return (non_admin or users)[:2] admin_users = [user for user in users if user.is_admin()]
return (non_admin + admin_users)[:2]
def personal_account_names() -> dict[str, str]: def personal_account_names() -> dict[str, str]:
+12 -1
View File
@@ -3,7 +3,7 @@ from __future__ import annotations
from decimal import Decimal from decimal import Decimal
from app.extensions import db from app.extensions import db
from app.models import Account, AllocationSuggestion, Month from app.models import Account, AllocationSuggestion, Month, User
from app.utils.users import personal_account_names from app.utils.users import personal_account_names
@@ -169,3 +169,14 @@ def test_seeded_distribution_entries_are_marked_as_allocation_targets(app):
assert target_entries["Freizeitbudget"] is True assert target_entries["Freizeitbudget"] is True
assert target_entries["Person 1"] is True assert target_entries["Person 1"] is True
assert target_entries["Person 2"] is True assert target_entries["Person 2"] is True
def test_personal_account_names_fill_with_admin_if_only_one_editor_is_active(app):
editor_b = User.query.filter_by(username="mitglied2").first()
editor_b.is_active = False
db.session.commit()
personal_labels = personal_account_names()
assert personal_labels["persoenlich-flo"] == "Person A"
assert personal_labels["persoenlich-desi"] == "Admin"