mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 05:22:16 +00:00
Removed unecessary for loop. Changed registration complete text. Profile model changes.
This commit is contained in:
2
.idea/PyRIGS.iml
generated
2
.idea/PyRIGS.iml
generated
@@ -11,7 +11,7 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="NewModuleRootManager">
|
<component name="NewModuleRootManager">
|
||||||
<content url="file://$MODULE_DIR$" />
|
<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="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="library" name="sass-stdlib" level="application" />
|
<orderEntry type="library" name="sass-stdlib" level="application" />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
3
.idea/dataSources.ids
generated
3
.idea/dataSources.ids
generated
@@ -830,4 +830,7 @@
|
|||||||
<primary-key name="PRIMARY" columns="id"/>
|
<primary-key name="PRIMARY" columns="id"/>
|
||||||
</table>
|
</table>
|
||||||
</data-source>
|
</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>
|
</component>
|
||||||
12
.idea/dataSources.xml
generated
12
.idea/dataSources.xml
generated
@@ -1,10 +1,10 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<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">
|
<data-source source="LOCAL" name="Django default" uuid="09730cb6-cd27-4034-9959-d242e7905a51">
|
||||||
<driver-ref>sqlite.xerial</driver-ref>
|
<driver-ref>sqlite.xerial</driver-ref>
|
||||||
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
|
<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>
|
<table-pattern>.*</table-pattern>
|
||||||
<libraries />
|
<libraries />
|
||||||
</data-source>
|
</data-source>
|
||||||
@@ -21,6 +21,14 @@
|
|||||||
</driver-properties>
|
</driver-properties>
|
||||||
<libraries />
|
<libraries />
|
||||||
</data-source>
|
</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>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|||||||
20
RIGS/migrations/0005_auto_20141104_1619.py
Normal file
20
RIGS/migrations/0005_auto_20141104_1619.py
Normal file
@@ -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,
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -6,7 +6,7 @@ import reversion
|
|||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
class Profile(AbstractUser):
|
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)
|
phone = models.CharField(max_length=13, null=True, blank=True)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
BIN
db.sqlite3
BIN
db.sqlite3
Binary file not shown.
@@ -5,6 +5,6 @@
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="alert alert-success">
|
<div class="alert alert-success">
|
||||||
<h2>Thanks for registering</h2>
|
<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>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@@ -19,14 +19,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% 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>
|
<p><input type="submit" value="Register" class="btn btn-primary pull-right"></p>
|
||||||
</form>
|
</form>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
Reference in New Issue
Block a user