diff --git a/.idea/PyRIGS.iml b/.idea/PyRIGS.iml index 2b9ccb41..eb7f7ac7 100644 --- a/.idea/PyRIGS.iml +++ b/.idea/PyRIGS.iml @@ -11,7 +11,7 @@ - + diff --git a/.idea/dataSources.ids b/.idea/dataSources.ids index dd862776..748b0aa7 100644 --- a/.idea/dataSources.ids +++ b/.idea/dataSources.ids @@ -830,4 +830,7 @@ + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index c7226b0d..d0308fd0 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,10 +1,10 @@ - + sqlite.xerial org.sqlite.JDBC - jdbc:sqlite:D:\Users\Ghost\PycharmProjects\pyrigs\db.sqlite3 + jdbc:sqlite:$PROJECT_DIR$/db.sqlite3 .* @@ -21,6 +21,14 @@ + + mysql + com.mysql.jdbc.Driver + jdbc:mysql://alfie.codedinternet.com/tec_rigs + tec_rigs + dfd2dfe7dfe4dfc8df82dfc8df81dfeddfc3dfdfdff7df8c + + diff --git a/RIGS/migrations/0005_auto_20141104_1619.py b/RIGS/migrations/0005_auto_20141104_1619.py new file mode 100644 index 00000000..0e8b24d2 --- /dev/null +++ b/RIGS/migrations/0005_auto_20141104_1619.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0004_organisation'), + ] + + operations = [ + migrations.AlterField( + model_name='profile', + name='initials', + field=models.CharField(blank=True, max_length=5, unique=True, null=True), + preserve_default=True, + ), + ] diff --git a/RIGS/models.py b/RIGS/models.py index 819f08e8..b41f8a33 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -6,7 +6,7 @@ import reversion # Create your models here. class Profile(AbstractUser): - initials = models.CharField(max_length=5, unique=True) + initials = models.CharField(max_length=5, unique=True, null=True, blank=True) phone = models.CharField(max_length=13, null=True, blank=True) @property diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html index 23827032..c7b02238 100644 --- a/templates/registration/registration_complete.html +++ b/templates/registration/registration_complete.html @@ -5,6 +5,6 @@ {% block content %}

Thanks for registering

-

Thanks for registering with RIGS, you application will now be moderated by an administrator and further instructions will be emailed to you

+

Thanks for registering with RIGS, further details will be emailed to you.

{% endblock %} \ No newline at end of file diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index aa6ec221..c8f5bbbf 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -19,14 +19,6 @@ {% endfor %} - {% for field in supplement_form %} -
- -
- {% render_field field class+="form-control" placeholder=field.label %} -
-
- {% endfor %}

{% endblock %} \ No newline at end of file