From a9201de50e529571dd89a396231aef3956d48158 Mon Sep 17 00:00:00 2001 From: hamub Date: Sat, 24 Jun 2017 19:01:10 +0200 Subject: [PATCH 1/2] added email as a mandatory field when registering --- .gitignore | 2 ++ .project | 18 ++++++++++++++++++ .pydevproject | 14 ++++++++++++++ accounts/forms.py | 3 +++ 4 files changed, 37 insertions(+) create mode 100644 .project create mode 100644 .pydevproject diff --git a/.gitignore b/.gitignore index 1a0c2bd..6d40977 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ tox.ini .cache/ .idea/ indaba/settings/production.py +.project +.pydevproject diff --git a/.project b/.project new file mode 100644 index 0000000..be2c170 --- /dev/null +++ b/.project @@ -0,0 +1,18 @@ + + + pyconzim_website + + + + + + org.python.pydev.PyDevBuilder + + + + + + org.python.pydev.django.djangoNature + org.python.pydev.pythonNature + + diff --git a/.pydevproject b/.pydevproject new file mode 100644 index 0000000..0122f23 --- /dev/null +++ b/.pydevproject @@ -0,0 +1,14 @@ + + +/home/hamub/.virtualenvs/pyladies/bin/python3.5 +python 3.0 + +DJANGO_MANAGE_LOCATION +manage.py +DJANGO_SETTINGS_MODULE +indaba.settings.development + + +/${PROJECT_DIR_NAME} + + diff --git a/accounts/forms.py b/accounts/forms.py index fedef07..5722dfb 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -6,7 +6,10 @@ class RegistrationForm(UserCreationForm): + + email = forms.CharField(max_length=75, required=True) + def __init__(self, *args, **kwargs): super(RegistrationForm, self).__init__(*args, **kwargs) From 266c142a1890ab38a035a3532b86849b920fa421 Mon Sep 17 00:00:00 2001 From: hamub Date: Wed, 28 Jun 2017 23:40:52 +0200 Subject: [PATCH 2/2] merged changes from master --- .pydevproject | 14 --------- accounts/forms.py | 3 +- talks/migrations/0011_auto_20170623_1217.py | 33 +++++++++++++++++++++ talks/migrations/0012_auto_20170623_1344.py | 20 +++++++++++++ 4 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 talks/migrations/0011_auto_20170623_1217.py create mode 100644 talks/migrations/0012_auto_20170623_1344.py diff --git a/.pydevproject b/.pydevproject index 0122f23..e69de29 100644 --- a/.pydevproject +++ b/.pydevproject @@ -1,14 +0,0 @@ - - -/home/hamub/.virtualenvs/pyladies/bin/python3.5 -python 3.0 - -DJANGO_MANAGE_LOCATION -manage.py -DJANGO_SETTINGS_MODULE -indaba.settings.development - - -/${PROJECT_DIR_NAME} - - diff --git a/accounts/forms.py b/accounts/forms.py index 5722dfb..5d9b3a1 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -6,10 +6,9 @@ class RegistrationForm(UserCreationForm): - + email = forms.CharField(max_length=75, required=True) - def __init__(self, *args, **kwargs): super(RegistrationForm, self).__init__(*args, **kwargs) diff --git a/talks/migrations/0011_auto_20170623_1217.py b/talks/migrations/0011_auto_20170623_1217.py new file mode 100644 index 0000000..ad1106f --- /dev/null +++ b/talks/migrations/0011_auto_20170623_1217.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-06-23 12:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('talks', '0010_auto_20170602_1327'), + ] + + operations = [ + migrations.CreateModel( + name='Email', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('subject', models.CharField(max_length=255)), + ('message', models.TextField(verbose_name='content of the email')), + ('recipient_group', models.CharField(choices=[('Keynote', 'Keynote Talk - 45 mins'), ('Short Talk', 'Short Talk - 30 mins'), ('Long Talk', 'Long Talk - 1 hour'), ('Tutorial', 'Tutorial - 2 hours or more')], max_length=50)), + ('user', models.ForeignKey(default='', on_delete=django.db.models.deletion.CASCADE, related_name='emails', to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.AddField( + model_name='proposal', + name='proposal', + field=models.CharField(default='', max_length=255), + ), + ] diff --git a/talks/migrations/0012_auto_20170623_1344.py b/talks/migrations/0012_auto_20170623_1344.py new file mode 100644 index 0000000..1fc499c --- /dev/null +++ b/talks/migrations/0012_auto_20170623_1344.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-06-23 13:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('talks', '0011_auto_20170623_1217'), + ] + + operations = [ + migrations.AlterField( + model_name='email', + name='recipient_group', + field=models.CharField(choices=[('S', 'Submitted'), ('A', 'Accepted'), ('W', 'Waiting List'), ('R', 'Rejected')], max_length=50), + ), + ]