Initial setup to use a custom User model, I still need to figure out how to use the built in Django permissions though

6 files changed, 80 insertions, 48 deletions

diff --git a/app/dispatch/migrations/0001_initial.py b/app/dispatch/migrations/0001_initial.py
index 05c6c7d..a358b07 100644
--- a/app/dispatch/migrations/0001_initial.py
+++ b/app/dispatch/migrations/0001_initial.py
@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-24 22:53
+# Generated by Django 1.11.5 on 2017-11-02 19:49
 from __future__ import unicode_literals
 
 import dispatch.misc
-from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -13,7 +11,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -37,7 +34,6 @@ class Migration(migrations.Migration):
                 ('city', models.CharField(max_length=256)),
                 ('state', models.CharField(max_length=256)),
                 ('zip_code', models.CharField(max_length=256)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True)),
             ],
         ),
         migrations.CreateModel(
@@ -48,9 +44,6 @@ class Migration(migrations.Migration):
                 ('invoice_date', models.DateField()),
                 ('due_date', models.DateField()),
                 ('paid', models.BooleanField(default=False)),
-                ('bill_to', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bill_to', to='dispatch.Identity')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='owner', to='dispatch.Identity')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(
@@ -61,7 +54,6 @@ class Migration(migrations.Migration):
                 ('description', models.CharField(max_length=256)),
                 ('quantity', models.IntegerField()),
                 ('amount', models.DecimalField(decimal_places=2, max_digits=19)),
-                ('invoice', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Invoice')),
             ],
         ),
         migrations.CreateModel(
@@ -72,8 +64,6 @@ class Migration(migrations.Migration):
                 ('description', models.CharField(max_length=256)),
                 ('delivered_to', models.CharField(default='', max_length=256)),
                 ('amount', models.DecimalField(decimal_places=2, default='0', max_digits=10)),
-                ('customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Customer')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(
@@ -82,7 +72,6 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('description', models.CharField(max_length=256)),
                 ('document', models.FileField(upload_to=dispatch.misc.paperwork_user_directory_path)),
-                ('load', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Load')),
             ],
         ),
         migrations.CreateModel(
@@ -98,7 +87,6 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('number', models.IntegerField(default=1200)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, unique=True)),
             ],
         ),
     ]
diff --git a/app/dispatch/migrations/0002_auto_20171024_2255.py b/app/dispatch/migrations/0002_auto_20171024_2255.py
deleted file mode 100644
index bbf96d4..0000000
--- a/app/dispatch/migrations/0002_auto_20171024_2255.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-10-24 22:55
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dispatch', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='identity',
-            name='user',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='userinvoicenumber',
-            name='user',
-            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/app/dispatch/migrations/0002_auto_20171102_1949.py b/app/dispatch/migrations/0002_auto_20171102_1949.py
new file mode 100644
index 0000000..4be45e9
--- /dev/null
+++ b/app/dispatch/migrations/0002_auto_20171102_1949.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-11-02 19:49
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('dispatch', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userinvoicenumber',
+            name='user',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='paperwork',
+            name='load',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Load'),
+        ),
+        migrations.AddField(
+            model_name='load',
+            name='customer',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Customer'),
+        ),
+        migrations.AddField(
+            model_name='load',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='invoiceitem',
+            name='invoice',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dispatch.Invoice'),
+        ),
+        migrations.AddField(
+            model_name='invoice',
+            name='bill_to',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='bill_to', to='dispatch.Identity'),
+        ),
+        migrations.AddField(
+            model_name='invoice',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='owner', to='dispatch.Identity'),
+        ),
+        migrations.AddField(
+            model_name='invoice',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='identity',
+            name='user',
+            field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/app/dispatch/models.py b/app/dispatch/models.py
index 21c06e0..fe0cdb3 100644
--- a/app/dispatch/models.py
+++ b/app/dispatch/models.py
@@ -2,15 +2,16 @@ from django.db import models
 from django.conf import settings
 from auditlog.registry import auditlog
 from auditlog.models import AuditlogHistoryField
-from django.contrib.auth.models import User
+# from django.contrib.auth import get_user_model
 from datetime import datetime
 from django.core.exceptions import ObjectDoesNotExist
 from .misc import get_week_dates, paperwork_user_directory_path
-
-from . import monkey_patch
+from django.core.urlresolvers import reverse
 
 # Create your models here.
 
+
+
 class Customer(models.Model):
     history         = AuditlogHistoryField()
     name            = models.CharField(max_length=256)
@@ -50,7 +51,7 @@ class Paperwork(models.Model):
 
 
 class Identity(models.Model):
-    user        = models.OneToOneField(User, on_delete=models.CASCADE)
+    user        = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     name        = models.CharField(max_length=256)
     address     = models.CharField(max_length=256)
     city        = models.CharField(max_length=256)
@@ -81,14 +82,14 @@ class Settings(models.Model):
 
 
 class UserInvoiceNumber(models.Model):
-    user        = models.OneToOneField(User, on_delete=models.CASCADE)
+    user        = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     number      = models.IntegerField(default=1200)
 
     def get_absolute_url(self):
         return '/drivers/view/{:d}'.format(self.user.pk)
 
 class Invoice(models.Model):
-    user            = models.ForeignKey(User, on_delete=models.CASCADE)
+    user            = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     owner           = models.ForeignKey(Identity, on_delete=models.CASCADE, related_name="owner")
     bill_to         = models.ForeignKey(Identity, on_delete=models.CASCADE, related_name="bill_to")
     invoice_id      = models.IntegerField()
diff --git a/app/dispatch/monkey_patch.py b/app/dispatch/monkey_patch.py
index 3b87287..cc61b6e 100644
--- a/app/dispatch/monkey_patch.py
+++ b/app/dispatch/monkey_patch.py
@@ -1,6 +1,9 @@
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
 
+# This should be going away soon with the addition
+# of my custom user model
+
 def get_absolute_url(self):
     return reverse('driver_details', kwargs={'pk': self.pk})
 
diff --git a/app/dispatch/views.py b/app/dispatch/views.py
index 918cf0d..5a94775 100644
--- a/app/dispatch/views.py
+++ b/app/dispatch/views.py
@@ -15,7 +15,7 @@ from django.core.urlresolvers import reverse_lazy
 from dispatch.models import Customer, Load, Paperwork, \
         Invoice, UserInvoiceNumber, Identity
 from dispatch.forms import AddPaperworkForm
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import UserPassesTestMixin
 # from django.http import HttpResponseRedirect
 from .misc import get_week_dates, split_loads_by_day
@@ -23,6 +23,8 @@ import datetime
 import re
 import os
 
+User = get_user_model()
+
 
 def home(request):
     return redirect(reverse('load_list'))