Skip to content

Commit 851cbc8

Browse files
authored
Merge pull request #38 from Xpirix/remove_members_and_certification_components
Remove members and certification components
2 parents 01d8079 + cf5dd72 commit 851cbc8

File tree

9 files changed

+408
-844
lines changed

9 files changed

+408
-844
lines changed

.pre-commit-config.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# See https://pre-commit.com for more information
2+
# See https://pre-commit.com/hooks.html for more hooks
3+
4+
exclude: 'static/'
5+
repos:
6+
# Fix end of files
7+
- repo: https://github.com/pre-commit/pre-commit-hooks
8+
rev: v5.0.0
9+
hooks:
10+
- id: trailing-whitespace
11+
- id: end-of-file-fixer
12+
- id: mixed-line-ending
13+
args:
14+
- '--fix=lf'
15+
16+
# Remove unused imports/variables
17+
- repo: https://github.com/myint/autoflake
18+
rev: v2.3.1
19+
hooks:
20+
- id: autoflake
21+
args:
22+
- "--in-place"
23+
- "--remove-unused-variables"
24+
- "--remove-all-unused-imports"
25+
26+
# Sort imports
27+
- repo: https://github.com/pycqa/isort
28+
rev: "6.0.1"
29+
hooks:
30+
- id: isort
31+
args: ["--profile", "black"]
32+
33+
# Black formatting
34+
- repo: https://github.com/psf/black
35+
rev: 25.1.0
36+
hooks:
37+
- id: black

django_project/base/admin.py

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@
1010
1111
"""
1212

13-
13+
import reversion
1414
from django.contrib import admin
1515
from django.contrib.flatpages.admin import FlatPageAdmin
1616
from django.contrib.flatpages.models import FlatPage
17-
from preferences.admin import PreferencesAdmin
1817
from django.utils.translation import gettext_lazy as _
19-
import reversion
18+
from preferences.admin import PreferencesAdmin
19+
20+
from .forms import ProjectFlatpageForm
2021
from .models import (
21-
Project,
22-
ProjectScreenshot,
2322
Domain,
2423
Organisation,
24+
Project,
25+
ProjectFlatpage,
26+
ProjectScreenshot,
2527
SitePreferences,
26-
ProjectFlatpage
2728
)
28-
from .forms import ProjectFlatpageForm
2929

3030
admin.site.unregister(FlatPage)
3131

@@ -40,14 +40,12 @@ class ProjectScreenshotAdmin(admin.TabularInline):
4040
class ProjectAdmin(reversion.admin.VersionAdmin):
4141
"""Admin for the project model."""
4242

43-
filter_horizontal = (
44-
'certification_managers',
45-
'changelog_managers',
46-
'sponsorship_managers',
47-
'lesson_managers',)
43+
filter_horizontal = ("changelog_managers",)
4844

4945
# Screenshot input in admin project panel.
50-
inlines = [ProjectScreenshotAdmin, ]
46+
inlines = [
47+
ProjectScreenshotAdmin,
48+
]
5149

5250
def queryset(self, request):
5351
"""Ensure we use the correct manager.
@@ -79,25 +77,26 @@ def queryset(self, request):
7977
class ProjectFlatPageAdmin(admin.ModelAdmin):
8078
form = ProjectFlatpageForm
8179
fieldsets = (
82-
(None, {
83-
'fields': (
84-
'project', 'url', 'title', 'content', 'sites')
85-
}), (_(
86-
'Advanced options'), {
87-
'classes': ('collapse',),
88-
'fields': (
89-
'enable_comments', 'registration_required', 'template_name')}),
80+
(None, {"fields": ("project", "url", "title", "content", "sites")}),
81+
(
82+
_("Advanced options"),
83+
{
84+
"classes": ("collapse",),
85+
"fields": ("enable_comments", "registration_required", "template_name"),
86+
},
87+
),
9088
)
91-
list_display = ('url', 'title', 'project')
92-
list_filter = ('project', 'sites', 'registration_required')
93-
search_fields = ('url', 'title')
89+
list_display = ("url", "title", "project")
90+
list_filter = ("project", "sites", "registration_required")
91+
search_fields = ("url", "title")
9492

9593

9694
class GeneralFlatPageAdmin(FlatPageAdmin):
9795
def get_queryset(self, request):
9896
qs = super(FlatPageAdmin, self).get_queryset(request)
99-
project_flatpage_ids = (
100-
ProjectFlatpage.objects.all().values_list('id', flat=True))
97+
project_flatpage_ids = ProjectFlatpage.objects.all().values_list(
98+
"id", flat=True
99+
)
101100
return qs.exclude(id__in=project_flatpage_ids)
102101

103102

0 commit comments

Comments
 (0)