added additional examples, formatted and cleaned up the code, updated requirements.txt

Author: duplxey

core/settings.py

@@ -130,6 +130,7 @@
 MEDIA_URL = "media/"
 MEDIA_ROOT = BASE_DIR / "mediafiles"
 
+
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 

core/urls.py

@@ -20,9 +20,7 @@
 admin.site.site_title = "TicketsPlus site admin"
 admin.site.site_header = "TicketsPlus administration"
 admin.site.index_title = "Site administration"
-admin.site.site_url = "/"
-admin.site.enable_nav_sidebar = True
-admin.site.empty_value_display = "-"
+# https://github.com/django/django/blob/main/django/contrib/admin/sites.py
 
 urlpatterns = [
     path("secretadmin/", admin.site.urls),

requirements.txt

@@ -0,0 +1,7 @@
+{% extends "admin/login.html" %}
+
+{% block content_title %}
+    <p style="background: #ffffcc; padding: 10px 8px">
+        This is a really important message.
+    </p>
+{% endblock %}

templates/admin/login.html

@@ -0,0 +1,14 @@
+{% extends "admin/base_site.html" %}
+{% load i18n %}
+
+{% block breadcrumbs %}<div class="breadcrumbs"><a href="{% url 'admin:index' %}">{% translate 'Home' %}</a></div>{% endblock %}
+
+{% block nav-sidebar %}{% endblock %}
+
+{% block content %}
+
+<p>{% translate "See you soon." %}</p>
+
+<p><a href="{% url 'admin:index' %}">{% translate 'Log in again' %}</a></p>
+
+{% endblock %}

templates/registration/logged_out.html

@@ -1,8 +1,11 @@
 from django.contrib import admin
 from django.contrib.admin import SimpleListFilter
+from django.urls import reverse
+from django.utils.html import format_html
 from djangoql.admin import DjangoQLSearchMixin
-from import_export.admin import ExportActionModelAdmin, ImportExportActionModelAdmin
+from import_export.admin import ImportExportActionModelAdmin
 
+from tickets.forms import TicketAdminForm
 from tickets.models import Venue, ConcertCategory, Concert, Ticket
 
 
@@ -16,25 +19,13 @@ class ConcertInline(admin.TabularInline):
     show_change_link = True
 
 
-class ConcertThroughInline(admin.TabularInline):
-    verbose_name = "concert"
-    verbose_name_plural = "concerts"
-    model = Concert.categories.through
-    fields = ["concert"]
-    readonly_fields = ["concert"]
-    max_num = 0
-    extra = 0
-    can_delete = False
-    show_change_link = True
-
-
 class VenueAdmin(admin.ModelAdmin):
     list_display = ["name", "address", "capacity"]
     inlines = [ConcertInline]
 
 
 class ConcertCategoryAdmin(admin.ModelAdmin):
-    inlines = [ConcertThroughInline]
+    pass
 
 
 class SoldOutFilter(SimpleListFilter):
@@ -54,11 +45,11 @@ def queryset(self, request, queryset):
             return queryset.exclude(tickets_left=0)
 
 
-class ConcertAdmin(DjangoQLSearchMixin, admin.ModelAdmin):
-    list_display = ["name", "venue", "starts_at", "display_price", "tickets_left", "display_sold_out"]
+class ConcertAdmin(admin.ModelAdmin):
+    list_display = ["name", "display_venue", "starts_at", "display_price", "tickets_left", "display_sold_out"]
+    search_fields = ["name", "venue__name", "venue__address"]
     list_filter = ["venue", SoldOutFilter]
     readonly_fields = ["tickets_left"]
-    search_fields = ["name", "venue__name", "venue__address"]
 
     def display_sold_out(self, obj):
         return obj.is_sold_out()
@@ -72,6 +63,12 @@ def display_price(self, obj):
     display_price.short_description = "Price"
     display_price.admin_order_field = "price"
 
+    def display_venue(self, obj):
+        link = reverse("admin:tickets_venue_change", args=[obj.venue.id])
+        return format_html('<a href="{}">{}</a>', link, obj.venue)
+
+    display_venue.short_description = "Venue"
+
 
 @admin.action(description="Activate selected tickets")
 def activate_tickets(modeladmin, request, queryset):
@@ -83,10 +80,10 @@ def deactivate_tickets(modeladmin, request, queryset):
     queryset.update(is_active=False)
 
 
-class TicketAdmin(ImportExportActionModelAdmin):
+class TicketAdmin(DjangoQLSearchMixin, ImportExportActionModelAdmin):
     list_display = ["customer_full_name", "concert", "payment_method", "paid_at", "is_active"]
-    list_filter = ["payment_method", "paid_at", "is_active"]
     actions = [activate_tickets, deactivate_tickets]
+    form = TicketAdminForm
 
 
 admin.site.register(Venue, VenueAdmin)

tickets/admin.py

@@ -0,0 +1,37 @@
+from django import forms
+from django.forms import ModelForm, RadioSelect
+
+from tickets.models import Ticket
+
+
+class TicketAdminForm(ModelForm):
+    first_name = forms.CharField(label="First name", max_length=32)
+    last_name = forms.CharField(label="Last name", max_length=32)
+
+    class Meta:
+        model = Ticket
+        fields = ["concert", "first_name", "last_name", "payment_method", "is_active"]
+        widgets = {
+            "payment_method": RadioSelect(),
+        }
+
+    def __init__(self, *args, **kwargs):
+        instance = kwargs.get("instance")
+        initial = {}
+
+        if instance:
+            customer_full_name_split = instance.customer_full_name.split(
+                " ", maxsplit=1
+            )
+            initial = {
+                "first_name": customer_full_name_split[0],
+                "last_name": customer_full_name_split[1],
+            }
+
+        super().__init__(*args, **kwargs, initial=initial)
+
+    def save(self, commit=True):
+        self.instance.customer_full_name = (
+            self.cleaned_data["first_name"] + " " + self.cleaned_data["last_name"]
+        )
+        return super().save(commit)

tickets/forms.py

@@ -20,13 +20,13 @@ def handle(self, *args, **options):
                 name="Arena of Nîmes", address="Boulevard des Arènes, 30000 Nîmes, France", capacity=720,
             ),
             Venue.objects.get_or_create(
-                name="Red Rocks Amphitheatre", address="18300 W Alameda, Morrison, CO, United States", capacity=640,
+                name="Red Rocks Amphitheatre", address="18300 W Alameda, Morrison, United States", capacity=640,
             ),
             Venue.objects.get_or_create(
                 name="Dalhalla Amphitheatre", address="Dalhalla, 790 90 Rättvik, Sweden", capacity=800,
             ),
             Venue.objects.get_or_create(
-                name="The Fillmore", address="1805 Geary Blvd, San Francisco, CA, United States", capacity=620,
+                name="The Fillmore", address="1805 Geary Blvd, San Francisco, United States", capacity=620,
             ),
         ]
 
@@ -46,7 +46,7 @@ def handle(self, *args, **options):
                 description="",
                 venue=venue,
                 starts_at=datetime.now(pytz.utc)
-                + timedelta(days=random.randint(1, 365)),
+                          + timedelta(days=random.randint(1, 365)),
                 price=random.randint(10, 100),
             )
             concert.categories.add(category)
@@ -60,7 +60,9 @@ def handle(self, *args, **options):
             Ticket.objects.create(
                 concert=concert,
                 customer_full_name=f"{random.choice(names)} {random.choice(surname)}",
-                payment_method=random.choice(["CC", "CC", "CC", "CC", "DC", "DC", "ET", "BC"]),
+                payment_method=random.choice(
+                    ["CC", "CC", "CC", "CC", "DC", "DC", "ET", "BC"]
+                ),
                 paid_at=datetime.now(pytz.utc) - timedelta(days=random.randint(1, 365)),
                 is_active=random.choice([True, False]),
             )

tickets/management/commands/populate_db.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.4 on 2023-08-15 20:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tickets", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="concert",
+            options={"ordering": ["starts_at"]},
+        ),
+        migrations.AlterModelOptions(
+            name="concertcategory",
+            options={
+                "ordering": ["-name"],
+                "verbose_name": "concert category",
+                "verbose_name_plural": "concert categories",
+            },
+        ),
+    ]

tickets/migrations/0002_alter_concert_options_alter_concertcategory_options.py

@@ -18,6 +18,7 @@ class ConcertCategory(models.Model):
     class Meta:
         verbose_name = "concert category"
         verbose_name_plural = "concert categories"
+        ordering = ["-name"]
 
     def __str__(self):
         return f"{self.name}"
@@ -35,8 +36,10 @@ class Concert(models.Model):
     class Meta:
         ordering = ["starts_at"]
 
-    def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
-        if self.pk is None:
+    def save(
+        self, force_insert=False, force_update=False, using=None, update_fields=None
+    ):
+        if self.id is None:
             self.tickets_left = self.venue.capacity
 
         super().save(force_insert, force_update, using, update_fields)
@@ -57,7 +60,9 @@ class Ticket(models.Model):
         ("ET", "Ethereum"),
         ("BC", "Bitcoin"),
     ]
-    payment_method = models.CharField(max_length=2, default="CC", choices=PAYMENT_METHODS)
+    payment_method = models.CharField(
+        max_length=2, default="CC", choices=PAYMENT_METHODS
+    )
     paid_at = models.DateTimeField(auto_now_add=True)
     is_active = models.BooleanField(default=True)