TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/webhooks

Browse Source
This commit is contained in:
Aarni Halinen
2022-01-13 22:58:10 +02:00
parent 02634c8e02 8d2a26a9d1
commit 34faf53347
181 changed files with 3830 additions and 2295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ohlhafv/apps.py
+1 -1
View File
@@ -2,4 +2,4 @@ from django.apps import AppConfig
class OhlhafvConfig(AppConfig):
name = 'ohlhafv'
name = "ohlhafv"
ohlhafv/forms.py
+1 -1
View File
@@ -14,4 +14,4 @@ class OhlhafvForm(forms.ModelForm):
"""Meta class for Ohlhafv form."""
model = OhlhafvChallenge
fields = ['challenger', 'victim', 'victim_email', 'series', 'message']
fields = ["challenger", "victim", "victim_email", "series", "message"]
ohlhafv/migrations/0001_initial.py
+43 -12
View File
@@ -9,24 +9,55 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
]
dependencies = []
operations = [
migrations.CreateModel(
name='OhlhafvChallenge',
name="OhlhafvChallenge",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('challenger', models.CharField(max_length=255, verbose_name='Challenger')),
('victim', models.CharField(max_length=255, verbose_name='Victim')),
('challenger_email', models.EmailField(max_length=254, verbose_name='Challenger email')),
('victim_email', models.EmailField(max_length=254, verbose_name='Victim email')),
('series', 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')),
('message', models.TextField(blank=True, verbose_name='Message')),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"challenger",
models.CharField(max_length=255, verbose_name="Challenger"),
),
("victim", models.CharField(max_length=255, verbose_name="Victim")),
(
"challenger_email",
models.EmailField(max_length=254, verbose_name="Challenger email"),
),
(
"victim_email",
models.EmailField(max_length=254, verbose_name="Victim email"),
),
(
"series",
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",
),
),
("message", models.TextField(blank=True, verbose_name="Message")),
],
options={
'verbose_name': 'Ohlhafv challenge',
'verbose_name_plural': 'Ohlhafv challenges',
"verbose_name": "Ohlhafv challenge",
"verbose_name_plural": "Ohlhafv challenges",
},
),
]
ohlhafv/migrations/0002_remove_ohlhafvchallenge_challenger_email.py
+3 -3
View File
@@ -8,12 +8,12 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('ohlhafv', '0001_initial'),
("ohlhafv", "0001_initial"),
]
operations = [
migrations.RemoveField(
model_name='ohlhafvchallenge',
name='challenger_email',
model_name="ohlhafvchallenge",
name="challenger_email",
),
]
ohlhafv/models.py
+13 -13
View File
@@ -12,32 +12,32 @@ from phonenumber_field.modelfields import PhoneNumberField
import logging
VERBOSE_NAME = _('Ohlhafv')
VERBOSE_NAME = _("Ohlhafv")
class OhlhafvChallenge(models.Model):
"""Model containing all info about ohlhafv challenge."""
class Meta:
verbose_name = _('Ohlhafv challenge')
verbose_name_plural = _('Ohlhafv challenges')
verbose_name = _("Ohlhafv challenge")
verbose_name_plural = _("Ohlhafv challenges")
SERIES_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)'))
("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)")),
)
challenger = models.CharField(_('Challenger'), max_length=255)
victim = models.CharField(_('Victim'), max_length=255)
victim_email = models.EmailField(_('Victim email'))
series = models.CharField(_('Series'), choices=SERIES_CHOICES, max_length=10)
message = models.TextField(_('Message'), blank=True, null=False)
challenger = models.CharField(_("Challenger"), max_length=255)
victim = models.CharField(_("Victim"), max_length=255)
victim_email = models.EmailField(_("Victim email"))
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)
return _("Ohlhafv challenge: {} vs. {}").format(self.challenger, self.victim)
auditlog.register(OhlhafvChallenge)
ohlhafv/urls.py
+4 -3
View File
@@ -8,11 +8,12 @@ from ohlhafv.views import *
urlpatterns = [
# ohlhafv
url(r'^submit', ohlhafv_submit),
url(r'^list', ohlhafv_list),
url(r'^$', ohlhafv_view)
url(r"^submit", ohlhafv_submit),
url(r"^list", ohlhafv_list),
url(r"^$", ohlhafv_view),
]
if settings.DEBUG:
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
urlpatterns += staticfiles_urlpatterns()