Django admin for Organizer/Event

src/tixlbase/admin.py

@@ -3,7 +3,9 @@ from django.contrib.auth.admin import UserAdmin
 from django.utils.translation import ugettext as _
 from django import forms
 
-from tixlbase.models import User
+from tixlbase.models import (
+    User, Organizer, OrganizerPermission, Event, EventPermission
+)
 
 
 class TixlUserCreationForm(forms.ModelForm):
@@ -57,4 +59,36 @@ class TixlUserAdmin(UserAdmin):
     list_filter = ('is_staff', 'is_active', 'groups')
     add_form = TixlUserCreationForm
 
+
+class OrganizerPermissionInline(admin.TabularInline):
+
+    model = OrganizerPermission
+    extra = 2
+
+
+class OrganizerAdmin(admin.ModelAdmin):
+
+    model = Organizer
+    inlines = [OrganizerPermissionInline]
+    list_display = ('name', 'slug')
+    search_fields = ('name', 'slug')
+
+
+class EventPermissionInline(admin.TabularInline):
+
+    model = EventPermission
+    extra = 2
+
+
+class EventAdmin(admin.ModelAdmin):
+
+    model = Event
+    inlines = [EventPermissionInline]
+    list_display = ('name', 'slug', 'organizer', 'date_from')
+    search_fields = ('name', 'slug')
+    list_filter = ('date_from', 'locale', 'currency')
+
+
 admin.site.register(User, TixlUserAdmin)
+admin.site.register(Organizer, OrganizerAdmin)
+admin.site.register(Event, EventAdmin)

src/tixlbase/migrations/0006_auto_20140912_1855.py

@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tixlbase', '0005_auto_20140911_2052'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='event',
+            options={'verbose_name_plural': 'Events', 'verbose_name': 'Event', 'ordering': ('date_from', 'name')},
+        ),
+        migrations.AlterModelOptions(
+            name='eventpermission',
+            options={'verbose_name_plural': 'Event permissions', 'verbose_name': 'Event permission'},
+        ),
+        migrations.AlterModelOptions(
+            name='organizer',
+            options={'verbose_name_plural': 'Organizers', 'verbose_name': 'Organizer', 'ordering': ('name',)},
+        ),
+        migrations.AlterModelOptions(
+            name='organizerpermission',
+            options={'verbose_name_plural': 'Organizer permissions', 'verbose_name': 'Organizer permission'},
+        ),
+        migrations.AlterModelOptions(
+            name='user',
+            options={'verbose_name_plural': 'Users', 'verbose_name': 'User'},
+        ),
+        migrations.RenameField(
+            model_name='eventpermission',
+            old_name='organizer',
+            new_name='event',
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='currency',
+            field=models.CharField(max_length=10, verbose_name='Default currency'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='date_from',
+            field=models.DateTimeField(verbose_name='Event start time'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='date_to',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Event end time'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='locale',
+            field=models.CharField(max_length=10, verbose_name='Default locale', choices=[('de', 'German'), ('en', 'English')]),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='name',
+            field=models.CharField(max_length=200, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='payment_term_days',
+            field=models.IntegerField(verbose_name='Payment term in days', default=14),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='payment_term_last',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Last date of payments'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='presale_end',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='End of presale'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='presale_start',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Start of presale'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='show_date_to',
+            field=models.BooleanField(verbose_name='Show event end date', default=True),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='show_times',
+            field=models.BooleanField(verbose_name='Show dates with time', default=True),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='slug',
+            field=models.CharField(db_index=True, max_length=50, verbose_name='Slug'),
+        ),
+        migrations.AlterField(
+            model_name='eventpermission',
+            name='can_change_settings',
+            field=models.BooleanField(verbose_name='Can change event settings', default=True),
+        ),
+        migrations.AlterField(
+            model_name='organizer',
+            name='name',
+            field=models.CharField(max_length=200, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='organizer',
+            name='slug',
+            field=models.CharField(db_index=True, max_length=50, verbose_name='Slug', unique=True),
+        ),
+        migrations.AlterField(
+            model_name='organizerpermission',
+            name='can_create_events',
+            field=models.BooleanField(verbose_name='Can create events', default=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='date_joined',
+            field=models.DateTimeField(verbose_name='Date joined', auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_active',
+            field=models.BooleanField(verbose_name='Is active', default=True),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_staff',
+            field=models.BooleanField(verbose_name='Is site admin', default=False),
+        ),
+        migrations.AlterUniqueTogether(
+            name='eventpermission',
+            unique_together=set([('event', 'user')]),
+        ),
+    ]

src/tixlbase/models.py

@@ -1,6 +1,7 @@
 from django.db import models
+from django.conf import settings
 from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 
 
 class UserManager(BaseUserManager):
@@ -75,9 +76,12 @@ class User(AbstractBaseUser, PermissionsMixin):
     familyname = models.CharField(max_length=255, blank=True,
                                   null=True,
                                   verbose_name=_('Family name'))
-    is_active = models.BooleanField(default=True)
-    is_staff = models.BooleanField(default=False)
-    date_joined = models.DateTimeField(auto_now_add=True)
+    is_active = models.BooleanField(default=True,
+                                    verbose_name=_('Is active'))
+    is_staff = models.BooleanField(default=False,
+                                   verbose_name=('Is site admin'))
+    date_joined = models.DateTimeField(auto_now_add=True,
+                                       verbose_name=_('Date joined'))
 
     objects = UserManager()
 
@@ -119,6 +123,8 @@ class User(AbstractBaseUser, PermissionsMixin):
     REQUIRED_FIELDS = ['username']
 
     class Meta:
+        verbose_name = _("User")
+        verbose_name_plural = _("Users")
         unique_together = (("event", "username"),)
 
 
@@ -129,13 +135,20 @@ class Organizer(models.Model):
     all lowercase) being used in URLs.
     """
 
-    name = models.CharField(max_length=200)
+    name = models.CharField(max_length=200,
+                            verbose_name=_("Name"))
     slug = models.CharField(max_length=50,
-                            unique=True, db_index=True)
+                            unique=True, db_index=True,
+                            verbose_name=_("Slug"))
     permitted = models.ManyToManyField(User, through='OrganizerPermission',
                                        related_name="organizers")
 
+    def __str__(self):
+        return self.name
+
     class Meta:
+        verbose_name = _("Organizer")
+        verbose_name_plural = _("Organizers")
         ordering = ("name",)
 
 
@@ -147,9 +160,20 @@ class OrganizerPermission(models.Model):
 
     organizer = models.ForeignKey(Organizer)
     user = models.ForeignKey(User, related_name="organizer_perms")
-    can_create_events = models.BooleanField(default=True)
+    can_create_events = models.BooleanField(
+        default=True,
+        verbose_name=_("Can create events"),
+    )
+
+    def __str__(self):
+        return _("%(name)s on %(object)s") % {
+            'name': str(self.user),
+            'object': str(self.organizer),
+        }
 
     class Meta:
+        verbose_name = _("Organizer permission")
+        verbose_name_plural = _("Organizer permissions")
         unique_together = (("organizer", "user"),)
 
 
@@ -181,22 +205,51 @@ class Event(models.Model):
 
     organizer = models.ForeignKey(Organizer, related_name="events",
                                   on_delete=models.PROTECT)
-    name = models.CharField(max_length=200)
-    slug = models.CharField(max_length=50, db_index=True)
+    name = models.CharField(max_length=200,
+                            verbose_name=_("Name"))
+    slug = models.CharField(max_length=50, db_index=True,
+                            verbose_name=_("Slug"))
     permitted = models.ManyToManyField(User, through='EventPermission',
-                                       related_name="events")
-    locale = models.CharField(max_length=10)
-    currency = models.CharField(max_length=10)
-    date_from = models.DateTimeField()
-    date_to = models.DateTimeField(null=True, blank=True)
-    show_date_to = models.BooleanField(default=True)
-    show_times = models.BooleanField(default=True)
-    presale_end = models.DateTimeField(null=True, blank=True)
-    presale_start = models.DateTimeField(null=True, blank=True)
-    payment_term_days = models.IntegerField(default=14)
-    payment_term_last = models.DateTimeField(null=True, blank=True)
+                                       related_name="events",)
+    locale = models.CharField(max_length=10,
+                              choices=settings.LANGUAGES,
+                              verbose_name=_("Default locale"))
+    currency = models.CharField(max_length=10,
+                                verbose_name=_("Default currency"))
+    date_from = models.DateTimeField(verbose_name=_("Event start time"))
+    date_to = models.DateTimeField(null=True, blank=True,
+                                   verbose_name=_("Event end time"))
+    show_date_to = models.BooleanField(
+        default=True,
+        verbose_name=_("Show event end date")
+    )
+    show_times = models.BooleanField(
+        default=True,
+        verbose_name=_("Show dates with time")
+    )
+    presale_end = models.DateTimeField(
+        null=True, blank=True,
+        verbose_name=_("End of presale")
+    )
+    presale_start = models.DateTimeField(
+        null=True, blank=True,
+        verbose_name=_("Start of presale")
+    )
+    payment_term_days = models.IntegerField(
+        default=14,
+        verbose_name=_("Payment term in days")
+    )
+    payment_term_last = models.DateTimeField(
+        null=True, blank=True,
+        verbose_name=_("Last date of payments")
+    )
+
+    def __str__(self):
+        return self.name
 
     class Meta:
+        verbose_name = _("Event")
+        verbose_name_plural = _("Events")
         unique_together = (("organizer", "slug"),)
         ordering = ("date_from", "name")
 
@@ -207,9 +260,20 @@ class EventPermission(models.Model):
     access an event.
     """
 
-    organizer = models.ForeignKey(Event)
+    event = models.ForeignKey(Event)
     user = models.ForeignKey(User, related_name="event_perms")
-    can_change_settings = models.BooleanField(default=True)
+    can_change_settings = models.BooleanField(
+        default=True,
+        verbose_name=_("Can change event settings")
+    )
+
+    def __str__(self):
+        return _("%(name)s on %(object)s") % {
+            'name': str(self.user),
+            'object': str(self.event),
+        }
 
     class Meta:
-        unique_together = (("organizer", "user"),)
+        verbose_name = _("Event permission")
+        verbose_name_plural = _("Event permissions")
+        unique_together = (("event", "user"),)

src/tixlbase/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.