From 6a6de6882bb4c65959f1f9cbe7fa8d1cdcacf954 Mon Sep 17 00:00:00 2001 From: Martin Putzlocher Date: Mon, 27 Jul 2026 11:30:42 +0200 Subject: [PATCH] Versuch Admin-Ansicht zu reparieren --- SchulSchachTV.kdev4 | 4 + SchulSchachTV/asgi.py | 16 --- SchulSchachTV/settings.py | 123 ------------------------ SchulSchachTV/urls.py | 22 ----- SchulSchachTV/wsgi.py | 16 --- {SchulSchachTV => accounts}/__init__.py | 0 accounts/admin.py | 27 ++++++ config/urls.py | 2 +- manage.py | 2 +- tournaments/__init__.py | 0 tournaments/admin.py | 38 ++++++++ 11 files changed, 71 insertions(+), 179 deletions(-) create mode 100644 SchulSchachTV.kdev4 delete mode 100644 SchulSchachTV/asgi.py delete mode 100644 SchulSchachTV/settings.py delete mode 100644 SchulSchachTV/urls.py delete mode 100644 SchulSchachTV/wsgi.py rename {SchulSchachTV => accounts}/__init__.py (100%) create mode 100644 accounts/admin.py create mode 100644 tournaments/__init__.py create mode 100644 tournaments/admin.py diff --git a/SchulSchachTV.kdev4 b/SchulSchachTV.kdev4 new file mode 100644 index 0000000..5787a60 --- /dev/null +++ b/SchulSchachTV.kdev4 @@ -0,0 +1,4 @@ +[Project] +CreatedFrom= +Manager=KDevCustomBuildSystem +Name=SchulSchachTV diff --git a/SchulSchachTV/asgi.py b/SchulSchachTV/asgi.py deleted file mode 100644 index 1a720d2..0000000 --- a/SchulSchachTV/asgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -ASGI config for SchulSchachTV project. - -It exposes the ASGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/ -""" - -import os - -from django.core.asgi import get_asgi_application - -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'SchulSchachTV.settings') - -application = get_asgi_application() diff --git a/SchulSchachTV/settings.py b/SchulSchachTV/settings.py deleted file mode 100644 index 2f909fb..0000000 --- a/SchulSchachTV/settings.py +++ /dev/null @@ -1,123 +0,0 @@ -""" -Django settings for SchulSchachTV project. - -Generated by 'django-admin startproject' using Django 4.2.30. - -For more information on this file, see -https://docs.djangoproject.com/en/4.2/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/4.2/ref/settings/ -""" - -from pathlib import Path - -# Build paths inside the project like this: BASE_DIR / 'subdir'. -BASE_DIR = Path(__file__).resolve().parent.parent - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'django-insecure-yrn+^m7@(-q6l$##ed3hz2q@u7&#wmi$dqg+&y-6zr+)tnfgr3' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] - - -# Application definition - -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', -] - -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] - -ROOT_URLCONF = 'SchulSchachTV.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - ], - }, - }, -] - -WSGI_APPLICATION = 'SchulSchachTV.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/4.2/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } -} - - -# Password validation -# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators - -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - - -# Internationalization -# https://docs.djangoproject.com/en/4.2/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/4.2/howto/static-files/ - -STATIC_URL = 'static/' - -# Default primary key field type -# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field - -DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/SchulSchachTV/urls.py b/SchulSchachTV/urls.py deleted file mode 100644 index ad5a2bd..0000000 --- a/SchulSchachTV/urls.py +++ /dev/null @@ -1,22 +0,0 @@ -""" -URL configuration for SchulSchachTV project. - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/4.2/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: path('', views.home, name='home') -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') -Including another URLconf - 1. Import the include() function: from django.urls import include, path - 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) -""" -from django.contrib import admin -from django.urls import path - -urlpatterns = [ - path('admin/', admin.site.urls), -] diff --git a/SchulSchachTV/wsgi.py b/SchulSchachTV/wsgi.py deleted file mode 100644 index a4d3753..0000000 --- a/SchulSchachTV/wsgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -WSGI config for SchulSchachTV project. - -It exposes the WSGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/ -""" - -import os - -from django.core.wsgi import get_wsgi_application - -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'SchulSchachTV.settings') - -application = get_wsgi_application() diff --git a/SchulSchachTV/__init__.py b/accounts/__init__.py similarity index 100% rename from SchulSchachTV/__init__.py rename to accounts/__init__.py diff --git a/accounts/admin.py b/accounts/admin.py new file mode 100644 index 0000000..42aff1b --- /dev/null +++ b/accounts/admin.py @@ -0,0 +1,27 @@ +from django.contrib import admin +from django.contrib.auth.admin import UserAdmin as BaseUserAdmin +from .models import User, Player + + +@admin.register(User) +class CustomUserAdmin(BaseUserAdmin): + list_display = ('username', 'email', 'first_name', 'last_name', 'role') + list_filter = ('role', 'is_staff', 'is_active') + search_fields = ('username', 'email', 'first_name', 'last_name') + + # Zeigt die Rolle direkt in der Liste an + fieldsets = BaseUserAdmin.fieldsets + ( + ('Rolle', {'fields': ('role',)}), + ) + + +@admin.register(Player) +class PlayerAdmin(admin.ModelAdmin): + list_display = ('first_name', 'last_name', 'club') + search_fields = ('first_name', 'last_name', 'club') + list_filter = ('club',) + + def get_queryset(self, request): + # Performance-Optimierung: Lade den User-Mitmenschen mit (falls vorhanden) + return super().get_queryset(request).select_related('user') + diff --git a/config/urls.py b/config/urls.py index dfbc2e3..0318dfc 100644 --- a/config/urls.py +++ b/config/urls.py @@ -14,5 +14,5 @@ urlpatterns = [ path('api/v1/accounts/', include('accounts.urls')), path('api/v1/tournaments/', include('tournaments.urls')), ] -o + diff --git a/manage.py b/manage.py index 7d8d454..8e7ac79 100755 --- a/manage.py +++ b/manage.py @@ -6,7 +6,7 @@ import sys def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'SchulSchachTV.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/tournaments/__init__.py b/tournaments/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tournaments/admin.py b/tournaments/admin.py new file mode 100644 index 0000000..615f70d --- /dev/null +++ b/tournaments/admin.py @@ -0,0 +1,38 @@ +from django.contrib import admin +from .models import Tournament, Registration, Round, Match + + +class RegistrationInline(admin.TabularInline): + model = Registration + extra = 0 + # autocomplete_fields entfernt, um Startkonflikte zu vermeiden. + # Normale Select-Boxen sind für <= 50 Spieler besser! + +@admin.register(Tournament) +class TournamentAdmin(admin.ModelAdmin): + list_display = ('name', 'date', 'participant_count') + search_fields = ('name',) + inlines = [RegistrationInline] + + def participant_count(self, obj): + return obj.registrations.count() + participant_count.short_description = "Teilnehmer" + + +class MatchInline(admin.TabularInline): + model = Match + extra = 0 + # autocomplete_fields hier ebenfalls entfernt + +@admin.register(Round) +class RoundAdmin(admin.ModelAdmin): + list_display = ('tournament', 'round_number') + list_filter = ('tournament',) + inlines = [MatchInline] + + +@admin.register(Match) +class MatchAdmin(admin.ModelAdmin): + list_display = ('round_detail', 'player_white', 'player_black', 'result') + list_filter = ('result', 'round_detail__tournament') +