1
0
mirror of https://gitlab.crans.org/mediatek/med.git synced 2025-07-06 20:54:01 +02:00

No more manage memberships, we will use NK20

This commit is contained in:
2021-10-23 14:49:44 +02:00
parent 7f24e5c1bf
commit 2a17a32d4c
6 changed files with 24 additions and 72 deletions

View File

@ -13,12 +13,7 @@ from reversion.admin import VersionAdmin
from med.admin import admin_site
from .forms import UserCreationAdminForm
from .models import Adhesion, User
class AdhesionAdmin(VersionAdmin):
list_display = ('starting_in', 'ending_in')
autocomplete_fields = ('members',)
from .models import User
class IsMemberFilter(admin.SimpleListFilter):
@ -31,12 +26,7 @@ class IsMemberFilter(admin.SimpleListFilter):
)
def queryset(self, request, queryset):
value = self.value()
if value == 'Yes':
# Get current membership year and list all members
last_adh_year = Adhesion.objects.all().order_by('starting_in') \
.reverse().first()
return last_adh_year.members
# FIXME Replace with imported Note Kfet memberships
return queryset
@ -88,9 +78,8 @@ class UserAdmin(VersionAdmin, BaseUserAdmin):
"""
Get current membership year and check if user is there
"""
last_adh_year = Adhesion.objects.all().order_by('starting_in') \
.reverse().first()
is_member = last_adh_year and obj in last_adh_year.members.all()
# FIXME Use NK20
is_member = True
if is_member:
return format_html(
'<img src="/static/admin/img/icon-yes.svg" alt="True">'
@ -108,4 +97,3 @@ class UserAdmin(VersionAdmin, BaseUserAdmin):
admin_site.register(User, UserAdmin)
admin_site.register(Adhesion, AdhesionAdmin)