diff --git a/fet2020/blackboard/admin.py b/fet2020/blackboard/admin.py index e88014c5..fe9f25eb 100644 --- a/fet2020/blackboard/admin.py +++ b/fet2020/blackboard/admin.py @@ -4,6 +4,7 @@ from .forms import JobPostingForm from .models import JobPosting +@admin.register(JobPosting) class JobPostingAdmin(admin.ModelAdmin): form = JobPostingForm model = JobPosting @@ -34,6 +35,3 @@ class JobPostingAdmin(admin.ModelAdmin): form_url, extra_context=extra_context, ) - - -admin.site.register(JobPosting, JobPostingAdmin) diff --git a/fet2020/core/admin.py b/fet2020/core/admin.py index d6429e5f..669391c3 100644 --- a/fet2020/core/admin.py +++ b/fet2020/core/admin.py @@ -10,6 +10,7 @@ from .models import CustomFlatPage # Define a new FlatPageAdmin +@admin.register(CustomFlatPage) class CustomFlatPageAdmin(FlatPageAdmin): form = FlatPageForm fieldsets = ( @@ -85,7 +86,6 @@ admin.site.site_title = "FET" # Re-register FlatPageAdmin admin.site.unregister(FlatPage) -admin.site.register(CustomFlatPage, CustomFlatPageAdmin) admin.site.unregister(Site) diff --git a/fet2020/finance/admin.py b/fet2020/finance/admin.py index 5ae79f95..991d764c 100644 --- a/fet2020/finance/admin.py +++ b/fet2020/finance/admin.py @@ -23,6 +23,7 @@ class BillInline(admin.TabularInline): show_change_link = True +@admin.register(BankData) class BankDataAdmin(admin.ModelAdmin): form = BankDataAdminForm model = BankData @@ -52,6 +53,7 @@ class BankDataAdmin(admin.ModelAdmin): ) +@admin.register(Bill) class BillAdmin(admin.ModelAdmin): form = BillAdminForm model = Bill @@ -142,6 +144,7 @@ class BillAdmin(admin.ModelAdmin): obj.author = request.user super().save_model(request, obj, form, change) + @admin.display(description="Kontoinhaber:in") def get_bankdata_name(self, obj): try: tmp = BankData.objects.get(id=obj.bankdata.id) @@ -150,8 +153,7 @@ class BillAdmin(admin.ModelAdmin): return f"{ tmp.name }" - get_bankdata_name.short_description = "Kontoinhaber:in" - + @admin.display(description="IBAN") def get_bankdata_iban(self, obj): try: tmp = BankData.objects.get(id=obj.bankdata.id) @@ -160,8 +162,7 @@ class BillAdmin(admin.ModelAdmin): return f"{ tmp.iban }" - get_bankdata_iban.short_description = "IBAN" - + @admin.display(description="BIC") def get_bankdata_bic(self, obj): try: tmp = BankData.objects.get(id=obj.bankdata.id) @@ -170,8 +171,7 @@ class BillAdmin(admin.ModelAdmin): return f"{ tmp.bic }" - get_bankdata_bic.short_description = "BIC" - + @admin.display(description="Status") def status_colored(self, obj): # TODO: if there is a status without color, set nothing. colors = { @@ -184,8 +184,6 @@ class BillAdmin(admin.ModelAdmin): f'{obj.get_status_display()}' ) - status_colored.short_description = "Status" - @admin.action(description="Als 'Abgerechnet' markieren.") def make_cleared(self, request, queryset): updated = queryset.update(status="C") @@ -215,6 +213,7 @@ class BillAdmin(admin.ModelAdmin): ) +@admin.register(Resolution) class ResolutionAdmin(admin.ModelAdmin): form = ResolutionAdminForm model = Resolution @@ -285,6 +284,7 @@ class ResolutionAdmin(admin.ModelAdmin): extra_context=extra_context, ) + @admin.display(description="Gesamtsumme (EUR)") def total(self, obj): total = 0 bills = Bill.objects.filter(resolution=obj) @@ -293,9 +293,8 @@ class ResolutionAdmin(admin.ModelAdmin): return f"{ total }" - total.short_description = "Gesamtsumme (EUR)" - +@admin.register(Wiref) class WirefAdmin(admin.ModelAdmin): form = WirefAdminForm model = Wiref @@ -327,6 +326,7 @@ class WirefAdmin(admin.ModelAdmin): extra_context=extra_context, ) + @admin.display(description="Gesamtsumme (EUR)") def total(self, obj): total = 0 bills = Bill.objects.filter(wiref=obj) @@ -334,11 +334,3 @@ class WirefAdmin(admin.ModelAdmin): total += elem.amount return f"{ total }" - - total.short_description = "Gesamtsumme (EUR)" - - -admin.site.register(BankData, BankDataAdmin) -admin.site.register(Bill, BillAdmin) -admin.site.register(Resolution, ResolutionAdmin) -admin.site.register(Wiref, WirefAdmin) diff --git a/fet2020/gallery/admin.py b/fet2020/gallery/admin.py index 35aa0c72..691cc4f0 100644 --- a/fet2020/gallery/admin.py +++ b/fet2020/gallery/admin.py @@ -4,6 +4,7 @@ from .forms import AlbumAdminForm from .models import Album +@admin.register(Album) class AlbumAdmin(admin.ModelAdmin): form = AlbumAdminForm model = Album @@ -36,6 +37,3 @@ class AlbumAdmin(admin.ModelAdmin): def save_model(self, request, obj, form, change): obj.author = request.user super().save_model(request, obj, form, change) - - -admin.site.register(Album, AlbumAdmin) diff --git a/fet2020/intern/admin.py b/fet2020/intern/admin.py index 15fb3a76..e31aeed2 100644 --- a/fet2020/intern/admin.py +++ b/fet2020/intern/admin.py @@ -49,6 +49,7 @@ class FileUploadInline(admin.TabularInline): verbose_name_plural = "Dateien" +@admin.register(TopicGroup) class TopicGroupAdmin(admin.ModelAdmin): form = TopicGroupAdminForm model = TopicGroup @@ -98,6 +99,7 @@ class TopicGroupAdmin(admin.ModelAdmin): super().save_model(request, obj, form, change) +@admin.register(Topic) class TopicAdmin(admin.ModelAdmin): form = TopicAdminForm model = Topic @@ -146,6 +148,7 @@ class TopicAdmin(admin.ModelAdmin): super().save_model(request, obj, form, change) +@admin.register(Attachment) class AttachmentAdmin(admin.ModelAdmin): form = AttachmentAdminForm model = Attachment @@ -193,6 +196,7 @@ class AttachmentAdmin(admin.ModelAdmin): super().save_model(request, obj, form, change) +@admin.register(Etherpad) class EtherpadAdmin(admin.ModelAdmin): form = EtherpadAdminForm model = Etherpad @@ -225,6 +229,7 @@ class EtherpadAdmin(admin.ModelAdmin): super().save_model(request, obj, form, change) +@admin.register(FileUpload) class FileUploadAdmin(admin.ModelAdmin): form = FileUploadAdminForm model = FileUpload @@ -254,10 +259,3 @@ class FileUploadAdmin(admin.ModelAdmin): def save_model(self, request, obj, form, change): obj.created_by = request.user super().save_model(request, obj, form, change) - - -admin.site.register(TopicGroup, TopicGroupAdmin) -admin.site.register(Topic, TopicAdmin) -admin.site.register(Attachment, AttachmentAdmin) -admin.site.register(Etherpad, EtherpadAdmin) -admin.site.register(FileUpload, FileUploadAdmin) diff --git a/fet2020/members/admin.py b/fet2020/members/admin.py index 3728b08a..2aa732d0 100644 --- a/fet2020/members/admin.py +++ b/fet2020/members/admin.py @@ -64,6 +64,7 @@ class JobInline(admin.TabularInline): show_change_link = True +@admin.register(Member) class MemberAdmin(admin.ModelAdmin): form = MemberForm model = Member @@ -120,6 +121,7 @@ class MemberAdmin(admin.ModelAdmin): super().save_model(request, obj, form, change) +@admin.register(Job) class JobAdmin(admin.ModelAdmin): form = JobForm model = Job @@ -175,6 +177,7 @@ class JobAdmin(admin.ModelAdmin): super().save_model(request, obj, form, change) +@admin.register(JobGroup) class JobGroupAdmin(admin.ModelAdmin): form = JobGroupForm model = JobGroup @@ -228,8 +231,3 @@ class JobGroupAdmin(admin.ModelAdmin): def save_model(self, request, obj, form, change): obj.author = request.user super().save_model(request, obj, form, change) - - -admin.site.register(Member, MemberAdmin) -admin.site.register(Job, JobAdmin) -admin.site.register(JobGroup, JobGroupAdmin) diff --git a/fet2020/posts/admin.py b/fet2020/posts/admin.py index 6e2245b7..a46e26a7 100644 --- a/fet2020/posts/admin.py +++ b/fet2020/posts/admin.py @@ -6,6 +6,7 @@ from .forms import EventForm, FetMeetingForm, NewsForm, PostForm from .models import Event, FetMeeting, FileUpload, News, Post +@admin.action(description="In eine Fachschaftssitzung konvertieren") def make_fetmeeting(self, request, queryset): qs = self.get_queryset(request).filter(id=request.POST["_selected_action"]).first() @@ -41,9 +42,6 @@ def make_fetmeeting(self, request, queryset): ) -make_fetmeeting.short_description = "In eine Fachschaftssitzung konvertieren" - - class FileUploadInline(admin.TabularInline): model = FileUpload extra = 0 @@ -97,6 +95,7 @@ class PostAdmin(admin.ModelAdmin): ] +@admin.register(News) class NewsAdmin(PostAdmin): form = NewsForm model = News @@ -144,6 +143,7 @@ class NewsAdmin(PostAdmin): inlines = (FileUploadInline,) +@admin.register(Event) class EventAdmin(PostAdmin): form = EventForm model = Event @@ -205,6 +205,7 @@ class EventAdmin(PostAdmin): ) +@admin.register(FetMeeting) class FetMeetingAdmin(EventAdmin): form = FetMeetingForm model = FetMeeting @@ -226,8 +227,3 @@ class FetMeetingAdmin(EventAdmin): }, ), ) - - -admin.site.register(Event, EventAdmin) -admin.site.register(News, NewsAdmin) -admin.site.register(FetMeeting, FetMeetingAdmin)