Merge branch 'hotfix-ohlhafv-form' into 'develop'

Remove unneeded challenger email field

See merge request vtmk/web2.0!104
This commit is contained in:
Aarni Halinen
2018-01-30 17:00:56 +02:00
3 changed files with 20 additions and 3 deletions
+1 -2
View File
@@ -14,5 +14,4 @@ class OhlhafvForm(forms.ModelForm):
"""Meta class for Ohlhafv form."""
model = OhlhafvChallenge
fields = ['challenger', 'challenger_email',
'victim', 'victim_email', 'series', 'message']
fields = ['challenger', 'victim', 'victim_email', 'series', 'message']
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2018-01-30 14:45
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('ohlhafv', '0001_initial'),
]
operations = [
migrations.RemoveField(
model_name='ohlhafvchallenge',
name='challenger_email',
),
]
-1
View File
@@ -32,7 +32,6 @@ class OhlhafvChallenge(models.Model):
challenger = models.CharField(_('Challenger'), max_length=255)
victim = models.CharField(_('Victim'), max_length=255)
challenger_email = models.EmailField(_('Challenger email'))
victim_email = models.EmailField(_('Victim email'))
series = models.CharField(_('Series'), choices=SERIES_CHOICES, max_length=10)
message = models.TextField(_('Message'), blank=True, null=False)