Updated middleware to force creation of user Identity. Fix issues with Identity creation. Added is_active to Django Admin UI for the dispatchAuth.models.User

2 files changed, 13 insertions, 1 deletions

diff --git a/app/dispatch/templates/dispatch/identity/create.html b/app/dispatch/templates/dispatch/identity/create.html
index 90cdd8e..ab7b805 100644
--- a/app/dispatch/templates/dispatch/identity/create.html
+++ b/app/dispatch/templates/dispatch/identity/create.html
@@ -8,6 +8,14 @@
     </div>
 </div> 
 
+<div class="row">
+  <div class="col s12">
+    <p class="flow-text">
+    Your user account does not have a company identity. Please fill out the form to create one at this time.
+    </p>
+  </div>
+</div>
+
 <form action="" method="post">{% csrf_token %}
     {{ form.as_p }}
     <input type="submit" class="btn green" value="Save" />
diff --git a/app/dispatch/templates/dispatch/nav.html b/app/dispatch/templates/dispatch/nav.html
index a5f09e5..ef65d24 100644
--- a/app/dispatch/templates/dispatch/nav.html
+++ b/app/dispatch/templates/dispatch/nav.html
@@ -1,4 +1,8 @@
-{% if request.user.is_authenticated %}
+{% if False %} # Checking for user identity and limiting the nav if it doesn't exist {% endif %}
+
+{% if not request.user.identity %}
+  <li><a href="{% url 'logout' %}">Logout</a></li>
+{% elif request.user.is_authenticated %}
   <li><a href="{% url 'load_list' %}">Loads</a></li>
   <li><a href="{% url 'invoice_list' %}">Invoices</a></li>
   {% if request.user.is_superuser %}