Add Ohlhafv to admin and auditlog

This commit is contained in:
Aarni Halinen
2018-01-25 21:36:00 +02:00
parent b2aa6d1a3e
commit 7d17d8a84f
7 changed files with 133 additions and 69 deletions
+2 -1
View File
@@ -3,7 +3,7 @@
from django.contrib import admin
from webapp.models import Official, Role
from webapp.models import Feed, Tag, BaseFeed, Event, Registration
from webapp.models import KaehmyForm, KaehmyMessage
from webapp.models import KaehmyForm, KaehmyMessage, OhlhafvChallenge
from webapp.models import CustomKaehmyRole, PresetKaehmyRole
from webapp.models import TelegramChannel
from modeltranslation.admin import TranslationAdmin
@@ -24,3 +24,4 @@ admin.site.register(KaehmyMessage)
admin.site.register(CustomKaehmyRole)
admin.site.register(PresetKaehmyRole, TranslationAdmin)
admin.site.register(TelegramChannel)
admin.site.register(OhlhafvChallenge)
@@ -0,0 +1,30 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2018-01-25 19:31
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('webapp', '0036_auto_20180124_1712'),
]
operations = [
migrations.AlterField(
model_name='ohlhafvchallenge',
name='message',
field=models.TextField(blank=True, verbose_name='Message'),
),
migrations.AlterField(
model_name='ohlhafvchallenge',
name='series',
field=models.CharField(choices=[('0.33 L', '0.33 L'), ('0.5 L', '0.5 L'), ('1.0 L', '1.0 L'), ('Team', 'Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)')], max_length=10, verbose_name='Series'),
),
migrations.AlterField(
model_name='ohlhafvchallenge',
name='victim_email',
field=models.EmailField(max_length=254, verbose_name='Victim email'),
),
]
+5
View File
@@ -289,6 +289,10 @@ class OhlhafvChallenge(models.Model):
series = models.CharField(_('Series'), choices=SERIES_CHOICES, max_length=10)
message = models.TextField(_('Message'), blank=True, null=False)
def __str__(self):
"""Return model info."""
return _('Ohlhafv challenge: {} vs. {}').format(self.challenger, self.victim)
# Telegram channel entry for Kaehmys
class TelegramChannel(models.Model):
@@ -311,3 +315,4 @@ auditlog.register(Event)
auditlog.register(PresetRole)
auditlog.register(Role)
auditlog.register(Official)
auditlog.register(OhlhafvChallenge)