Skip to content

Commit 7bc2b1a

Browse files
committed
1 parent 67b2b84 commit 7bc2b1a

10 files changed

Lines changed: 135 additions & 131 deletions

File tree

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Django code for phpMyAdmin's website.
1313
Requirements
1414
------------
1515

16-
Website needs Python 3.7, additional dependencies are listed in `requirements.txt`.
16+
Website needs Python 3.13, additional dependencies are listed in `requirements.txt`.
1717

1818

1919
Security announcements and news

demo/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from demo.models import Demo
33

44

5+
@admin.register(Demo)
56
class DemoAdmin(admin.ModelAdmin):
67
list_display = ('name', 'master_version')
78

8-
admin.site.register(Demo, DemoAdmin)

files/admin.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,20 @@
2424
from files.models import Release, Download, Theme
2525

2626

27+
@admin.register(Release)
2728
class ReleaseAdmin(admin.ModelAdmin):
2829
date_hierarchy = 'date'
2930
list_display = ('version', 'stable', 'date')
3031
search_fields = ('version',)
3132

3233

34+
@admin.register(Download)
3335
class DownloadAdmin(admin.ModelAdmin):
3436
list_display = ('filename', 'release', 'size', 'signed')
3537
search_fields = ('filename',)
3638

3739

40+
@admin.register(Theme)
3841
class ThemeAdmin(admin.ModelAdmin):
3942
list_display = (
4043
'display_name', 'version', 'filename', 'supported_versions', 'size',
@@ -43,15 +46,16 @@ class ThemeAdmin(admin.ModelAdmin):
4346
list_filter = ('supported_versions', 'show')
4447
actions = ('do_show', 'do_hide')
4548

49+
@admin.action(
50+
description="Mark selected themes as shown"
51+
)
4652
def do_show(self, request, queryset):
4753
queryset.update(show=True)
48-
do_show.short_description = "Mark selected themes as shown"
4954

55+
@admin.action(
56+
description="Mark selected themes as hidden"
57+
)
5058
def do_hide(self, request, queryset):
5159
queryset.update(show=False)
52-
do_hide.short_description = "Mark selected themes as hidden"
5360

5461

55-
admin.site.register(Release, ReleaseAdmin)
56-
admin.site.register(Download, DownloadAdmin)
57-
admin.site.register(Theme, ThemeAdmin)

news/admin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from news.models import Post, Planet
2424

2525

26+
@admin.register(Post)
2627
class PostAdmin(admin.ModelAdmin):
2728
list_display = ('title', 'date', 'author')
2829
list_filter = ('author',)
@@ -36,11 +37,10 @@ def save_model(self, request, obj, form, change):
3637
obj.save()
3738

3839

40+
@admin.register(Planet)
3941
class PlanetAdmin(admin.ModelAdmin):
4042
list_display = ('title', 'date', 'url')
4143
date_hierarchy = 'date'
4244
search_fields = ['title', 'url']
4345

4446

45-
admin.site.register(Planet, PlanetAdmin)
46-
admin.site.register(Post, PostAdmin)

pmaweb/tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from xml.etree import cElementTree as ElementTree
2424
from django.test import TestCase, override_settings
2525
from django.urls import reverse
26-
from django.utils.timezone import utc, make_aware
26+
from django.utils.timezone import make_aware
2727
import httpretty
2828
import datetime
2929
from pmaweb.views import REDIRECT_MAP, github_tree, github_commit
@@ -184,7 +184,7 @@ def test_news_post(self):
184184
['/', '/news/', '/news/feed/', '/news/2000/1/1/slug/', '/news/1/'],
185185
title='title', slug='slug', author_id=1,
186186
date=make_aware(
187-
datetime.datetime(year=2000, month=1, day=1), utc
187+
datetime.datetime(year=2000, month=1, day=1), datetime.timezone.utc
188188
),
189189
)
190190

@@ -195,6 +195,6 @@ def test_news_planet(self):
195195
['/'],
196196
title='title', url='https://example.net/',
197197
date=make_aware(
198-
datetime.datetime(year=2000, month=1, day=1), utc
198+
datetime.datetime(year=2000, month=1, day=1), datetime.timezone.utc
199199
),
200200
)

0 commit comments

Comments
 (0)