CMS/cmsmanage
2
0
Fork 0
Code Issues 8 Pull Requests 4 Actions Projects 1 Releases Activity

Compare commits

base: CMS:efb15dd118df3a5aa8a3f1031557e77d3d0e924e
Branches Tags
CMS:main
CMS:renovate/django-model-utils-5.x
CMS:renovate/sass-1.x-lockfile
CMS:renovate/vite-5.x-lockfile
CMS:renovate/postgres-16.x
..
compare: CMS:66ceb1aae15bcfd78f0f3866bd545bb797c1a884
Branches Tags
CMS:main
CMS:renovate/django-model-utils-5.x
CMS:renovate/sass-1.x-lockfile
CMS:renovate/vite-5.x-lockfile
CMS:renovate/postgres-16.x

6 Commits
efb15dd118 ... 66ceb1aae1

Author SHA1 Message Date
Adam Goldsmith
66ceb1aae1 membershipworks: Show change link in EventMeetingTimeInline
Some checks are pending
Ruff / ruff (push) Waiting to run
Details
Test / test (push) Waiting to run
Details
2024-09-09 20:36:02 -04:00
Adam Goldsmith
c31fea20ff reservations: Fix Reservation.__repr__ being sometimes recursively defined 2024-09-09 20:35:57 -04:00
Adam Goldsmith
5d98e300ea membershipworks: Indicate in admin events with meeting times not matching event start/end 2024-09-09 20:35:57 -04:00
Adam Goldsmith
2cc6f9d2e0 membershipworks: Add more useful MW links to EventAdmin change page 2024-09-09 20:35:57 -04:00
Adam Goldsmith
7d5fd08855 reservations: Add generated Reservation.timespan field and use it for filtering 2024-09-09 20:35:57 -04:00
Adam Goldsmith
7101e90f8f membershipworks: Copy EventMeetingTime start date to end in admin, when blank 
just a minor improvement in UX
 2024-09-09 20:35:57 -04:00
1 changed files with 2 additions and 10 deletions
Show Stats Expand all files Collapse all files

12
membershipworks/admin.py
View File

@ -1,5 +1,3 @@
from dataclasses import dataclass
from django.contrib import admin from django.contrib import admin
from django.contrib.humanize.templatetags.humanize import naturaltime from django.contrib.humanize.templatetags.humanize import naturaltime
from django.http import HttpRequest from django.http import HttpRequest
@ -233,15 +231,8 @@ class EventAdmin(DjangoObjectActions, admin.ModelAdmin):
] ]
class Media: class Media:
@dataclass(frozen=True)
class LazyViteAssetUrl(str):
asset: str
def __str__(self) -> str:
return vite_asset_url(self.asset)
js = [ js = [
LazyViteAssetUrl( vite_asset_url(
"membershipworks/js/event_meeting_time_admin_helper.entry.ts" "membershipworks/js/event_meeting_time_admin_helper.entry.ts"
) )
] ]
@ -284,6 +275,7 @@ class EventAdmin(DjangoObjectActions, admin.ModelAdmin):
ordering="meeting_times_match_event", ordering="meeting_times_match_event",
) )
def meeting_times_match_event(self, obj) -> bool: def meeting_times_match_event(self, obj) -> bool:
print(obj.meeting_times_match_event)
return obj.meeting_times_match_event return obj.meeting_times_match_event
@admin.display(description="MembershipWorks links") @admin.display(description="MembershipWorks links")