Skip to content

Grant admin: show included reimbursements on changelist #4599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
estyxx merged 2 commits into from
Apr 7, 2026
Merged

Grant admin: show included reimbursements on changelist #4599

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ac712d
Show included grant reimbursements on Grant admin changelist
estyxx Apr 7, 2026
5818625
Format Grant admin money columns as whole numbers
estyxx Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions backend/grants/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@ class GrantAdmin(ExportMixin, ConferencePermissionMixin, admin.ModelAdmin):
"conference",
"current_or_pending_status",
"total_amount_display",
"approved_amounts_display",
"country_type",
"user_has_ticket",
"has_voucher",
Expand Down Expand Up @@ -680,14 +681,16 @@ def has_sent_invitation_letter_request(self, obj: Grant) -> bool:
return ""

@admin.display(description="Total")
def total_amount_display(self, obj):
return f"{obj.total_allocated_amount:.2f}"

@admin.display(description="Approved Reimbursements")
def approved_amounts_display(self, obj):
return ", ".join(
f"{r.category.name}: {r.granted_amount}" for r in obj.reimbursements.all()
def total_amount_display(self, obj: Grant) -> str:
return f"{obj.total_allocated_amount:.0f}"

@admin.display(description="Included reimbursements")
def approved_amounts_display(self, obj: Grant) -> str:
text = ", ".join(
f"{r.category.name}: {r.granted_amount:.0f}"
for r in obj.reimbursements.all()
)
return text or "—"

def get_queryset(self, request):
qs = (
Expand Down
Loading