diff --git a/marietje/marietje/migrations/0005_user_study.py b/marietje/marietje/migrations/0005_user_study.py new file mode 100644 index 0000000..151b5d1 --- /dev/null +++ b/marietje/marietje/migrations/0005_user_study.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-11-03 10:47 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('marietje', '0004_user_reset_token'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='study', + field=models.CharField(blank=True, max_length=30, verbose_name='study'), + ), + ] diff --git a/marietje/marietje/models.py b/marietje/marietje/models.py index 0a1d59e..56beeea 100644 --- a/marietje/marietje/models.py +++ b/marietje/marietje/models.py @@ -77,6 +77,7 @@ class User(AbstractBaseUser, PermissionsMixin): 'Unselect this instead of deleting accounts.' ), ) + study = models.CharField(_('study'), max_length=30, blank=True) date_joined = models.DateTimeField(_('date joined'), default=timezone.now) objects = UserManager() diff --git a/marietje/marietje/templates/registration/login.html b/marietje/marietje/templates/registration/login.html index 3e9269e..4165e73 100644 --- a/marietje/marietje/templates/registration/login.html +++ b/marietje/marietje/templates/registration/login.html @@ -27,7 +27,7 @@