From 84326aa706e459a1b0094d4abcf60614e474a886 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 5 Nov 2016 14:36:30 +0100
Subject: [PATCH] Fixed migrations.

---
 .../migrations/0006_auto_20161104_1900.py     |  3 +-
 .../migrations/0007_auto_20161104_1915.py     |  2 +-
 .../migrations/0003_auto_20161105_1424.py     | 37 +++++++++++++++++++
 ...in_dates.py => 0004_auto_20161105_1426.py} |  5 +--
 4 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 modoboa/relaydomains/migrations/0003_auto_20161105_1424.py
 rename modoboa/relaydomains/migrations/{0003_remove_relaydomain_dates.py => 0004_auto_20161105_1426.py} (64%)

diff --git a/modoboa/admin/migrations/0006_auto_20161104_1900.py b/modoboa/admin/migrations/0006_auto_20161104_1900.py
index 9b70b7c7f..daac34e1b 100644
--- a/modoboa/admin/migrations/0006_auto_20161104_1900.py
+++ b/modoboa/admin/migrations/0006_auto_20161104_1900.py
@@ -12,8 +12,7 @@ def move_dates(apps, schema_editor):
     DomainAlias = apps.get_model("admin", "DomainAlias")
     Mailbox = apps.get_model("admin", "Mailbox")
     Alias = apps.get_model("admin", "Alias")
-    RelayDomain = apps.get_model("relaydomains", "RelayDomain")
-    for model in [Domain, DomainAlias, Mailbox, Alias, RelayDomain]:
+    for model in [Domain, DomainAlias, Mailbox, Alias]:
         for instance in model.objects.all():
             instance.creation = instance.dates.creation
             instance.last_modification = instance.dates.last_modification
diff --git a/modoboa/admin/migrations/0007_auto_20161104_1915.py b/modoboa/admin/migrations/0007_auto_20161104_1915.py
index 2f9c49b97..63ec15441 100644
--- a/modoboa/admin/migrations/0007_auto_20161104_1915.py
+++ b/modoboa/admin/migrations/0007_auto_20161104_1915.py
@@ -8,8 +8,8 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('relaydomains', '0003_remove_relaydomain_dates'),
         ('admin', '0006_auto_20161104_1900'),
+        ('relaydomains', '0004_auto_20161105_1426'),
     ]
 
     operations = [
diff --git a/modoboa/relaydomains/migrations/0003_auto_20161105_1424.py b/modoboa/relaydomains/migrations/0003_auto_20161105_1424.py
new file mode 100644
index 000000000..9b5ea8136
--- /dev/null
+++ b/modoboa/relaydomains/migrations/0003_auto_20161105_1424.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-11-05 13:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+def move_dates(apps, schema_editor):
+    """Move dates to models."""
+    RelayDomain = apps.get_model("relaydomains", "RelayDomain")
+    for model in [RelayDomain]:
+        for instance in model.objects.all():
+            instance.creation = instance.dates.creation
+            instance.last_modification = instance.dates.last_modification
+            instance.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('relaydomains', '0002_migrate_from_modoboa_admin_relaydomains'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='relaydomain',
+            name='creation',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AddField(
+            model_name='relaydomain',
+            name='last_modification',
+            field=models.DateTimeField(null=True),
+        ),
+        migrations.RunPython(move_dates),
+    ]
diff --git a/modoboa/relaydomains/migrations/0003_remove_relaydomain_dates.py b/modoboa/relaydomains/migrations/0004_auto_20161105_1426.py
similarity index 64%
rename from modoboa/relaydomains/migrations/0003_remove_relaydomain_dates.py
rename to modoboa/relaydomains/migrations/0004_auto_20161105_1426.py
index 36fde02f3..77b54e032 100644
--- a/modoboa/relaydomains/migrations/0003_remove_relaydomain_dates.py
+++ b/modoboa/relaydomains/migrations/0004_auto_20161105_1426.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-11-04 18:15
+# Generated by Django 1.9.5 on 2016-11-05 13:26
 from __future__ import unicode_literals
 
 from django.db import migrations
@@ -8,8 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('relaydomains', '0002_migrate_from_modoboa_admin_relaydomains'),
-        ('admin', '0006_auto_20161104_1900'),
+        ('relaydomains', '0003_auto_20161105_1424'),
     ]
 
     operations = [