diff --git a/RIGS/migrations/0006_auto_20141105_1553.py b/RIGS/migrations/0006_auto_20141105_1553.py new file mode 100644 index 00000000..a125838e --- /dev/null +++ b/RIGS/migrations/0006_auto_20141105_1553.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + dependencies = [ + ('RIGS', '0005_auto_20141104_1619'), + ] + + operations = [ + migrations.RenameField( + model_name='organisation', + old_name='unionAccount', + new_name='union_account', + ), + ] diff --git a/RIGS/templates/RIGS/organisation_detail.html b/RIGS/templates/RIGS/organisation_detail.html index c5d54ad0..952664d2 100644 --- a/RIGS/templates/RIGS/organisation_detail.html +++ b/RIGS/templates/RIGS/organisation_detail.html @@ -31,7 +31,7 @@
{{ object.notes|linebreaksbr }}
Union Account
-
{{ object.unionAccount|yesno }}
+
{{ object.union_account|yesno|capfirst }}
diff --git a/RIGS/templates/RIGS/organisation_form.html b/RIGS/templates/RIGS/organisation_form.html index f1161571..3ac87195 100644 --- a/RIGS/templates/RIGS/organisation_form.html +++ b/RIGS/templates/RIGS/organisation_form.html @@ -5,49 +5,74 @@ {% block content %}
-

Add Person

-
-
{% csrf_token %} - {% include 'form_errors.html' %} -
- -
- {% render_field form.name class+="form-control" placeholder=form.name.label %} +

{{ object.pk|yesno:"Edit,Add" }} Organisation

+ + {% csrf_token %} +
+
+ {% include 'form_errors.html' %} +
+ + +
+ {% render_field form.name class+="form-control" placeholder=form.name.label %} +
+
+ +
+ + +
+ {% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %} +
+
+ + +
+ + +
+ {% render_field form.email class+="form-control" type="email" placeholder=form.email.label %} +
+
+ +
+ + +
+ {% render_field form.address class+="form-control" placeholder=form.address.label %} +
-
- -
- {% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %} +
+
+ + +
+ {% render_field form.notes class+="form-control" placeholder=form.notes.label %} +
+
+ +
+
+
+ +
+
- -
- -
- {% render_field form.email class+="form-control" type="email" placeholder=form.email.label %} -
-
- -
- -
- {% render_field form.address class+="form-control" placeholder=form.address.label %} -
-
- -
- -
- {% render_field form.notes class+="form-control" placeholder=form.notes.label %} -
-
- -
- -
- -
+
+
+ +
+
{% endblock %} \ No newline at end of file diff --git a/RIGS/templates/RIGS/organisation_list.html b/RIGS/templates/RIGS/organisation_list.html index ca0c26c1..cddd4580 100644 --- a/RIGS/templates/RIGS/organisation_list.html +++ b/RIGS/templates/RIGS/organisation_list.html @@ -35,7 +35,6 @@ Email Phone Notes - l Union Account @@ -48,7 +47,7 @@ {{ object.email }} {{ object.phone }} {{ object.notes|yesno|capfirst }} - {{ object.unionAccount|yesno|capfirst }} + {{ object.union_account|yesno|capfirst }} @@ -60,7 +59,7 @@ {% empty %} - No people stored + No organisations found {% endfor %} diff --git a/RIGS/templates/RIGS/person_form.html b/RIGS/templates/RIGS/person_form.html index f1161571..ae980d3f 100644 --- a/RIGS/templates/RIGS/person_form.html +++ b/RIGS/templates/RIGS/person_form.html @@ -5,49 +5,64 @@ {% block content %}
-

Add Person

-
-
{% csrf_token %} - {% include 'form_errors.html' %} -
- -
- {% render_field form.name class+="form-control" placeholder=form.name.label %} +

{{ object.pk|yesno:"Edit,Add" }} Person

+ + {% csrf_token %} +
+
+ {% include 'form_errors.html' %} +
+ + +
+ {% render_field form.name class+="form-control" placeholder=form.name.label %} +
+
+ +
+ + +
+ {% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %} +
+
+ + +
+ + +
+ {% render_field form.email class+="form-control" type="email" placeholder=form.email.label %} +
+
+ +
+ + +
+ {% render_field form.address class+="form-control" placeholder=form.address.label %} +
-
- -
- {% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %} +
+
+ + +
+ {% render_field form.notes class+="form-control" placeholder=form.notes.label %} +
- -
- -
- {% render_field form.email class+="form-control" type="email" placeholder=form.email.label %} -
-
- -
- -
- {% render_field form.address class+="form-control" placeholder=form.address.label %} -
-
- -
- -
- {% render_field form.notes class+="form-control" placeholder=form.notes.label %} -
-
- -
- -
- -
+
+
+ +
+
{% endblock %} \ No newline at end of file diff --git a/RIGS/urls.py b/RIGS/urls.py index 0350888e..eecc025d 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -35,7 +35,7 @@ urlpatterns = patterns('', url(r'^organisations/(?P\d+)/$', permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()), name='organisation_detail'), - url(r'^organisation/(?P\d+)/edit/$', + url(r'^organisations/(?P\d+)/edit/$', permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()), name='organisation_update'), ) diff --git a/db.sqlite3 b/db.sqlite3 index 9818e75f..ea2de57c 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ