Replace calls to admin.site.register() with @admin.register() (#1424)

Author: jaap3

blogs/admin.py

@@ -7,15 +7,15 @@
 from .models import BlogEntry, Contributor, Translation, Feed, FeedAggregate
 
 
+@admin.register(Translation)
 class TranslationAdmin(ContentManageableModelAdmin):
     list_display = ['name', '_display_url']
 
     def _display_url(self, obj):
         return format_html('<a href="{0}">{0}</a>'.format(obj.url))
 
-admin.site.register(Translation, TranslationAdmin)
-
 
+@admin.register(Contributor)
 class ContributorAdmin(ContentManageableModelAdmin):
     list_display = ['_display_name']
 
@@ -25,9 +25,8 @@ def _display_name(self, obj):
         else:
             return "{} (PK#{})".format(obj.user.username, obj.user.pk)
 
-admin.site.register(Contributor, ContributorAdmin)
-
 
+@admin.register(BlogEntry)
 class BlogEntryAdmin(admin.ModelAdmin):
     list_display = ['title', 'pub_date']
     date_hierarchy = 'pub_date'
@@ -38,14 +37,11 @@ def sync_new_entries(self, request, queryset):
         self.message_user(request, "Blog entries updated.")
 
     sync_new_entries.short_description = "Sync new blog entries"
-    
 
-admin.site.register(BlogEntry, BlogEntryAdmin)
 
+@admin.register(FeedAggregate)
 class FeedAggregateAdmin(admin.ModelAdmin):
     list_display = ['name', 'slug', 'description']
     prepopulated_fields = {'slug': ('name',)}
 
-admin.site.register(FeedAggregate, FeedAggregateAdmin)
-
 admin.site.register(Feed)

boxes/admin.py

@@ -3,8 +3,6 @@
 from .models import Box
 
 
+@admin.register(Box)
 class BoxAdmin(ContentManageableModelAdmin):
     ordering = ('label', )
-
-
-admin.site.register(Box, BoxAdmin)

community/admin.py

@@ -19,6 +19,7 @@ class VideoInline(ContentManageableStackedInline):
     extra = 0
 
 
+@admin.register(Post)
 class PostAdmin(ContentManageableModelAdmin):
     date_hierarchy = 'created'
     list_display = ['__str__', 'status', 'media_type']
@@ -30,12 +31,7 @@ class PostAdmin(ContentManageableModelAdmin):
     ]
 
 
+@admin.register(Link, Photo, Video)
 class PostTypeAdmin(ContentManageableModelAdmin):
     date_hierarchy = 'created'
     raw_id_fields = ['post']
-
-
-admin.site.register(Post, PostAdmin)
-admin.site.register(Link, PostTypeAdmin)
-admin.site.register(Photo, PostTypeAdmin)
-admin.site.register(Video, PostTypeAdmin)

companies/admin.py

@@ -5,9 +5,8 @@
 from .models import Company
 
 
+@admin.register(Company)
 class CompanyAdmin(NameSlugAdmin):
     search_fields = ['name']
     list_display = ['__str__', 'contact', 'email']
     ordering = ['-pk']
-
-admin.site.register(Company, CompanyAdmin)

downloads/admin.py

@@ -4,6 +4,7 @@
 from cms.admin import ContentManageableModelAdmin, ContentManageableStackedInline
 
 
+@admin.register(OS)
 class OSAdmin(ContentManageableModelAdmin):
     model = OS
     prepopulated_fields = {"slug": ("name",)}
@@ -14,6 +15,7 @@ class ReleaseFileInline(ContentManageableStackedInline):
     extra = 0
 
 
+@admin.register(Release)
 class ReleaseAdmin(ContentManageableModelAdmin):
     inlines = [ReleaseFileInline]
     prepopulated_fields = {"slug": ("name",)}
@@ -23,6 +25,3 @@ class ReleaseAdmin(ContentManageableModelAdmin):
     list_filter = ['version', 'is_published', 'show_on_download_page']
     search_fields = ['name', 'slug']
     ordering = ['-release_date']
-
-admin.site.register(OS, OSAdmin)
-admin.site.register(Release, ReleaseAdmin)

events/admin.py

@@ -9,10 +9,6 @@ class EventInline(admin.StackedInline):
     extra = 0
 
 
-class CalendarAdmin(ContentManageableModelAdmin):
-    pass
-
-
 class OccurringRuleInline(admin.StackedInline):
     model = OccurringRule
     extra = 0
@@ -29,6 +25,7 @@ class AlarmInline(admin.StackedInline):
     extra = 0
 
 
+@admin.register(Event)
 class EventAdmin(ContentManageableModelAdmin):
     inlines = [OccurringRuleInline, RecurringRuleInline, AlarmInline]
     list_display = ['__str__', 'calendar', 'featured']
@@ -37,14 +34,11 @@ class EventAdmin(ContentManageableModelAdmin):
     search_fields = ['title']
 
 
+@admin.register(EventLocation)
 class EventLocationAdmin(admin.ModelAdmin):
     list_filter = ['calendar']
 
 
-admin.site.register(Calendar, CalendarAdmin)
 admin.site.register(EventCategory, NameSlugAdmin)
-admin.site.register(Event, EventAdmin)
-admin.site.register(OccurringRule)
-admin.site.register(RecurringRule)
-admin.site.register(Alarm, ContentManageableModelAdmin)
-admin.site.register(EventLocation, EventLocationAdmin)
+admin.site.register((OccurringRule, RecurringRule))
+admin.site.register((Alarm, Calendar), ContentManageableModelAdmin)

jobs/admin.py

@@ -4,6 +4,7 @@
 from cms.admin import NameSlugAdmin, ContentManageableModelAdmin
 
 
+@admin.register(Job)
 class JobAdmin(ContentManageableModelAdmin):
     date_hierarchy = 'created'
     filter_horizontal = ['job_types']
@@ -13,26 +14,21 @@ class JobAdmin(ContentManageableModelAdmin):
     search_fields = ['id', 'job_title']
 
 
+@admin.register(JobType)
 class JobTypeAdmin(NameSlugAdmin):
     list_display = ['__str__', 'active']
     list_filter = ['active']
     ordering = ('-active', 'name')
 
-admin.site.register(JobType, JobTypeAdmin)
-
 
+@admin.register(JobCategory)
 class JobCategoryAdmin(NameSlugAdmin):
     list_display = ['__str__', 'active']
     list_filter = ['active']
     ordering = ('-active', 'name')
 
 
+@admin.register(JobReviewComment)
 class JobReviewCommentAdmin(ContentManageableModelAdmin):
     list_display = ['__str__', 'job']
     ordering = ('-created',)
-
-admin.site.register(JobCategory, JobCategoryAdmin)
-
-admin.site.register(Job, JobAdmin)
-
-admin.site.register(JobReviewComment, JobReviewCommentAdmin)

minutes/admin.py

@@ -4,6 +4,7 @@
 from cms.admin import ContentManageableModelAdmin
 
 
+@admin.register(Minutes)
 class MinutesAdmin(ContentManageableModelAdmin):
     date_hierarchy = 'date'
 
@@ -14,5 +15,3 @@ def get_list_filter(self, request):
     def get_list_display(self, request):
         fields = list(super().get_list_display(request))
         return fields + ['is_published']
-
-admin.site.register(Minutes, MinutesAdmin)

nominations/admin.py

@@ -3,23 +3,21 @@
 from nominations.models import (Election, Nominee, Nomination)
 
 
+@admin.register(Election)
 class ElectionAdmin(admin.ModelAdmin):
     readonly_fields = ("slug",)
 
 
+@admin.register(Nominee)
 class NomineeAdmin(admin.ModelAdmin):
     raw_id_fields = ("user",)
     list_display = ("__str__", "election", "accepted", "approved")
     list_filter = ("election", "accepted", "approved")
     readonly_fields = ("slug",)
 
 
+@admin.register(Nomination)
 class NominationAdmin(admin.ModelAdmin):
     raw_id_fields = ("nominee", "nominator")
     list_display = ("__str__", "election", "accepted", "approved")
     list_filter = ("election", "accepted", "approved")
-
-
-admin.site.register(Election, ElectionAdmin)
-admin.site.register(Nominee, NomineeAdmin)
-admin.site.register(Nomination, NominationAdmin)

pages/admin.py

@@ -41,6 +41,7 @@ def queryset(self, request, queryset):
             return queryset.filter(path__startswith=self.value())
 
 
+@admin.register(Page)
 class PageAdmin(ContentManageableModelAdmin):
     search_fields = ['title', 'path']
     list_display = ('get_title', 'path', 'is_published',)
@@ -51,5 +52,3 @@ class PageAdmin(ContentManageableModelAdmin):
         ('Advanced options', {'classes': ('collapse',), 'fields': ('template_name',)}),
     ]
     save_as = True
-
-admin.site.register(Page, PageAdmin)