From 8f4edd66e7112d5c631f5a71d5a08c3405063799 Mon Sep 17 00:00:00 2001
From: Adam Bergen <adam3070@gmail.com>
Date: Tue, 4 Nov 2014 16:33:23 +0000
Subject: [PATCH] Removed unecessary for loop. Changed registration complete
 text. Profile model changes.

---
 .idea/PyRIGS.iml                              |   2 +-
 .idea/dataSources.ids                         |   3 +++
 .idea/dataSources.xml                         |  12 +++++++++--
 RIGS/migrations/0005_auto_20141104_1619.py    |  20 ++++++++++++++++++
 RIGS/models.py                                |   2 +-
 db.sqlite3                                    | Bin 694272 -> 698368 bytes
 .../registration/registration_complete.html   |   2 +-
 templates/registration/registration_form.html |   8 -------
 8 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 RIGS/migrations/0005_auto_20141104_1619.py

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 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.3.3 virtualenv at D:\Users\Ghost\.virtualenvs\pyrigs" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.4.2 virtualenv at ~/.virtualenvs/pyrigs" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="sass-stdlib" level="application" />
   </component>
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 @@
       <primary-key name="PRIMARY" columns="id"/>
     </table>
   </data-source>
+  <data-source source="LOCAL" name="Django legacy" uuid="04d2e6df-d917-475c-8507-d831cabc32c0">
+    <database-info product="" version="" jdbc-version="" driver-name="" driver-version=""/>
+  </data-source>
 </component>
\ 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DataSourceManagerImpl" format="xml" hash="12359522">
+  <component name="DataSourceManagerImpl" format="xml" hash="3810298710">
     <data-source source="LOCAL" name="Django default" uuid="09730cb6-cd27-4034-9959-d242e7905a51">
       <driver-ref>sqlite.xerial</driver-ref>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:D:\Users\Ghost\PycharmProjects\pyrigs\db.sqlite3</jdbc-url>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/db.sqlite3</jdbc-url>
       <table-pattern>.*</table-pattern>
       <libraries />
     </data-source>
@@ -21,6 +21,14 @@
       </driver-properties>
       <libraries />
     </data-source>
+    <data-source source="LOCAL" name="Django legacy" uuid="04d2e6df-d917-475c-8507-d831cabc32c0">
+      <driver-ref>mysql</driver-ref>
+      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://alfie.codedinternet.com/tec_rigs</jdbc-url>
+      <user-name>tec_rigs</user-name>
+      <user-password>dfd2dfe7dfe4dfc8df82dfc8df81dfeddfc3dfdfdff7df8c</user-password>
+      <libraries />
+    </data-source>
   </component>
 </project>
 
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/db.sqlite3 b/db.sqlite3
index 6f2d8b308efec5c449d1b6198662e33e2d18cb59..50c06965a7fef29a2778313165a06f6dea97772d 100644
GIT binary patch
delta 1056
zcmZWnU2IfU5S}x$e|PJZU2NGFtMtdUvFYyKd-uQoq}vs3ZE<7iN@Jqi<?h|O*mk$I
ztH6sCVTm!}$CJ>fK4Ap<gx>g8=`|+S$CB{Sn2-<=LxiM>KA@p7o^1l5;pEKunVD~9
zGT$7#(tT{L`|PvcT>!WQ0OAG`qMhpr3uWLBvWuUK*2RfS-&Q^%rxFnF?k@ftbu_!#
z4WLyzPX>kYKl}y1#0<8u8)kd!kL;CRw;h^ZPK^w{xnEI~Xf9u!E9W#tji{;;$*D0l
zS^or7HK0V=)L5^Y?2Tx_h!$6qs@dYW%XUd50WHxw{X}E*70pl|1xXUoH_+bMK>H+q
zrlW1A$4!1#&yuUmmW!oH19@LV8fk-{Y$&z5MY&$-akDHmjIIG)Gri-hlngK%u=la3
zC3HQS$j8IFp%--{nuruMt(b`ARV7?3=!JwHD;5%kdO$`GfF20=1~~z2#3cN#k@f6g
zYodKSLF@&l(yHm{vqW$}#k`*Sn>hqBIppUnoz3R$^d6TTgpC%w%lMkvHtr&x$$anF
z()}eu-=XJaYM189Q({Nes3y?$g+iKyGzy=4#5WJPn(dGQ$gsm~g_@{BmAc!bOp&p*
zp{MQ80nowL@B_R@Rdexcop^QS%mv$}Mvo0{0o-C0_AmZU%Wz=9Gm0rG2>pt~mklAe
zI(;ub-oIRK+W0i5J)y$O{La+@A*cEH)h~GUhd<4+<yLmws#&aNVa=kNWvf~Cn&qfj
z&YI==#*)^bs<VN(2$aD^!R$Ho&WCUZ%y*?+U9zmYTq)q=nWoQ-L#b-)Q2KQvrj%cJ
zcOX45GV)3M<H3E(>~MLoJXFdKzp?*dY+`b{k~}&Z>Ob;U`n@AZqci%ePYhX94JM<S
z77vepX!IMi6UKCYt~{GB<fp<)T<M#b%9kdCdU<Laa8G?aA0g+1Y^y}6U6!MglmeOO
zGZ$P)H-T<aoxSVS<E1XPEd_4pvpz^j_kr%yra;^!pN)Vaku1q{7>Jz!c7l%6&!R0Q
z=0oy@LU<}Lmp?dZd_EI&`uu)8)yaQNJ%@PF{3msm@y%rqUr9Up$#hF=c6hig`}W{F
q*}X3bR^5V0C`~6q4&RV}i&K6(z55xwB#L-w6MR3kMaFg`Uj858jToE&

delta 445
zcmYj~KS*0q7{$MP&wDTLC5paiHL(#IH63EaS`{Zt#6gS0gE}<OK^FzlVp`&#QII0E
zAZ;)7EecX<Qwl=sMO;h`IJ9FnU0lS$;vl#bOHe;2J)GZi&hT3(B^Q1q-`{s#BKehW
z)BYjV$z$75i^*dEhd0-wpV>(SZU#y|R7Ys4b7Yk88=o+SPI)Q+$am6{Q5}z62_3ag
zMU9O#;X4knhcjgG5wGC8DYWYcqyME!hx#RvdJ~!mJ5>e}&a<Zj!z0<()8i9UW1my@
zX01q7vCX6~aedJtO1e5-6v4%u8>mkt#8RujydG@S|N2V8>Iqx*LkYFp9P!uk!3KTR
zZ`!7SN9^2@PuOWgdES;Ka85Ya?&t|3m54jJ>6hH@j_$`nwh5F8Wq!|~E}n-X7S$2g
z6Z2vh_mCy(sktkv)P0$~p$daGh&JR4`4@949$VE-Uxu;y&8V#~DMOf%CvrsO{OX7t
z)W^SKLR}P2RkrX}t?Ue_LO!f|3teh9zr1J^myDudBm>4^OvYjYjJ<6Xo$~%QpTT`a

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 %}
 <div class="alert alert-success">
 	<h2>Thanks for registering</h2>
-	<p>Thanks for registering with RIGS, you application will now be moderated by an administrator and further instructions will be emailed to you</p>
+	<p>Thanks for registering with RIGS, further details will be emailed to you.</p>
 </div>
 {% 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 @@
     		</div>
     	</div>
     {% endfor %}
-    {% for field in supplement_form %}
-    	<div class="form-group">
-    		<label for="{{ field.id_for_label }}" class="control-label col-sm-2">{{ field.label }}</label>
-    		<div class="controls col-sm-10">
-    			{% render_field field class+="form-control" placeholder=field.label %}
-    		</div>
-    	</div>
-    {% endfor %}
     <p><input type="submit" value="Register" class="btn btn-primary pull-right"></p>
 </form>
 {% endblock %}
\ No newline at end of file