Skip to content

Merge dev into main #374

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
rasca merged 2 commits into from
Feb 26, 2026
Merged

Merge dev into main #374

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1790f7
Fix Django 6 format_html error in Alert admin
rasca Feb 26, 2026
959c7d5
Merge pull request #373 from genlayer-foundation/portal
rasca Feb 26, 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
9 changes: 5 additions & 4 deletions backend/contributions/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,12 +733,13 @@ def text_preview(self, obj):

def get_status(self, obj):
from django.utils import timezone as tz
from django.utils.safestring import mark_safe
now = tz.now()
if not obj.is_active:
return format_html('<span style="color: gray;">●</span> Inactive')
return mark_safe('<span style="color: gray;">●</span> Inactive')
if obj.start_date and now < obj.start_date:
return format_html('<span style="color: orange;">●</span> Scheduled')
return mark_safe('<span style="color: orange;">●</span> Scheduled')
if obj.end_date and now > obj.end_date:
return format_html('<span style="color: red;">●</span> Expired')
return format_html('<span style="color: green;">●</span> Active')
return mark_safe('<span style="color: red;">●</span> Expired')
return mark_safe('<span style="color: green;">●</span> Active')
get_status.short_description = 'Status'
Loading