From 74c82e7c8d25a9421d566a6386c7e464873d293e Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 8 Oct 2013 11:08:52 +0200
Subject: [PATCH] Fixing migrations.

---
 .../migrations/0002_update_permissions.py     | 31 ++++---------------
 .../admin/migrations/0037_rename_tables.py    |  4 ---
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/modoboa/core/migrations/0002_update_permissions.py b/modoboa/core/migrations/0002_update_permissions.py
index 8e8e4c481..31bc46068 100644
--- a/modoboa/core/migrations/0002_update_permissions.py
+++ b/modoboa/core/migrations/0002_update_permissions.py
@@ -11,34 +11,15 @@ class Migration(DataMigration):
 
     def forwards(self, orm):
         "Write your forwards methods here."
-        oldct = orm['contenttypes.ContentType'].objects.get(
-            app_label='admin', model='user'
-        )
-        newct = orm['contenttypes.ContentType'].objects.get(
-            app_label='core', model='user'
-        )
-        orm['core.ObjectAccess'].objects.filter(content_type=oldct).update(
-            content_type=newct
-        )
-        orm['reversion.Version'].objects.filter(content_type=oldct).update(
-            content_type=newct
-        )
-        oldct.delete()
+        orm['contenttypes.ContentType'].objects.filter(
+            app_label='admin', model__in=['user', 'extension', 'objectaccess']
+        ).update(app_label='core')
 
     def backwards(self, orm):
         "Write your backwards methods here."
-        newct = orm['contenttypes.ContentType'].objects.create(
-            app_label='admin', model='user', name='user'
-        )
-        oldct = orm['contenttypes.ContentType'].objects.get(
-            app_label='core', model='user'
-        )
-        orm['core.ObjectAccess'].objects.filter(content_type=oldct).update(
-            content_type=newct
-        )
-        orm['reversion.Version'].objects.filter(content_type=oldct).update(
-            content_type=newct
-        )
+        orm['contenttypes.ContentType'].objects.filter(
+            app_label='core', model__in=['user', 'extension', 'objectaccess']
+        ).update(app_label='admin')
 
     models = {
         u'auth.group': {
diff --git a/modoboa/extensions/admin/migrations/0037_rename_tables.py b/modoboa/extensions/admin/migrations/0037_rename_tables.py
index 01eac0d54..077918c22 100644
--- a/modoboa/extensions/admin/migrations/0037_rename_tables.py
+++ b/modoboa/extensions/admin/migrations/0037_rename_tables.py
@@ -24,8 +24,6 @@ class Migration(SchemaMigration):
 
         db.rename_table('admin_extension', 'core_extension')
 
-        db.send_create_signal('core', ['User', 'Extension', 'ObjectAccess'])
-
     def backwards(self, orm):
         db.rename_table('core_user', 'admin_user')
         # Changing field 'Mailbox.user'
@@ -39,8 +37,6 @@ class Migration(SchemaMigration):
 
         db.rename_table('core_extension', 'admin_extension')
 
-        db.send_create_signal('admin', ['User', 'Extension', 'ObjectAccess'])
-
     models = {
         'admin.alias': {
             'Meta': {'ordering': "['domain__name', 'address']", 'unique_together': "(('address', 'domain'),)", 'object_name': 'Alias'},