From 49be4d0374e6ac1253ced5f8f8b3e010ff127299 Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolaik@gmail.com>
Date: Tue, 22 Mar 2016 16:41:29 +0100
Subject: [PATCH] Revert move to native UUIDfield

---
 bestilling/models.py                         |  5 +++--
 design/migrations/0002_auto_20160322_1520.py | 19 -------------------
 prm/migrations/0002_auto_20160322_1520.py    | 19 -------------------
 tekst/migrations/0002_auto_20160322_1520.py  | 19 -------------------
 4 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 design/migrations/0002_auto_20160322_1520.py
 delete mode 100644 prm/migrations/0002_auto_20160322_1520.py
 delete mode 100644 tekst/migrations/0002_auto_20160322_1520.py

diff --git a/bestilling/models.py b/bestilling/models.py
index d689533..1161c44 100644
--- a/bestilling/models.py
+++ b/bestilling/models.py
@@ -5,6 +5,7 @@ from django.db import models
 from django.contrib.contenttypes.models import ContentType
 
 from bestilling.utils import validate_file_extension
+from django_extensions.db.fields import UUIDField
 
 
 class Attachment(models.Model):
@@ -23,8 +24,8 @@ class Attachment(models.Model):
 
 
 class Order(models.Model):
-    # uuid = UUIDField(unique=True, auto=True, version=1)  # version 1 guarantees no collisions
-    uuid = models.UUIDField(unique=True, default=uuid.uuid4)  # auto=True, version=1
+    uuid = UUIDField(unique=True, auto=True, version=1)  # version 1 guarantees no collisions
+    # uuid = models.UUIDField(unique=True, default=uuid.uuid4)  # auto=True, version=1
     client = models.CharField(max_length=50)
     deadline = models.DateField()
     contact_name = models.CharField(max_length=50)
diff --git a/design/migrations/0002_auto_20160322_1520.py b/design/migrations/0002_auto_20160322_1520.py
deleted file mode 100644
index 81046dd..0000000
--- a/design/migrations/0002_auto_20160322_1520.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('design', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='designorder',
-            name='uuid',
-            field=models.UUIDField(unique=True),
-        ),
-    ]
diff --git a/prm/migrations/0002_auto_20160322_1520.py b/prm/migrations/0002_auto_20160322_1520.py
deleted file mode 100644
index cc4f0ac..0000000
--- a/prm/migrations/0002_auto_20160322_1520.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('prm', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='prmorder',
-            name='uuid',
-            field=models.UUIDField(unique=True),
-        ),
-    ]
diff --git a/tekst/migrations/0002_auto_20160322_1520.py b/tekst/migrations/0002_auto_20160322_1520.py
deleted file mode 100644
index 49bb43c..0000000
--- a/tekst/migrations/0002_auto_20160322_1520.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('tekst', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='tekstorder',
-            name='uuid',
-            field=models.UUIDField(unique=True),
-        ),
-    ]