From f4bba6b369c5a9e7abf1e513d20ea0592972e410 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 25 Apr 2012 11:21:48 +0200
Subject: [PATCH] * Fixed buggy migration script

see #105
---
 admin/migrations/0017_set_permissions.py | 16 ++++++++--------
 settings_sample.py                       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/admin/migrations/0017_set_permissions.py b/admin/migrations/0017_set_permissions.py
index 7bc028707..e997cb59f 100644
--- a/admin/migrations/0017_set_permissions.py
+++ b/admin/migrations/0017_set_permissions.py
@@ -34,18 +34,18 @@ class Migration(DataMigration):
         for da in domadmins:
             for i, su in enumerate(superusers):
                 objaccess = orm.ObjectAccess(
-                    user=su, content_type=uct, object_id=da.id                    
+                    user=su, content_type=uct, object_id=da.id
                     )
                 if i == 0:
-                    objectaccess.is_owner=True
+                    objaccess.is_owner = True
                 objaccess.save()
                     
-                dom = da.mailbox_set.all()[0].domain
-                objaccess = orm.ObjectAccess(
-                    user=da, content_type=domct, object_id=dom.id, is_owner=True
-                    )
-                objaccess.save()
-                deferred_admin += [dom]
+            dom = da.mailbox_set.all()[0].domain
+            objaccess = orm.ObjectAccess(
+                user=da, content_type=domct, object_id=dom.id, is_owner=True
+                )
+            objaccess.save()
+            deferred_admin += [dom]
         
         for dom in domains:
             for i, su in enumerate(superusers):
diff --git a/settings_sample.py b/settings_sample.py
index 211cfaa2a..25ded5f9a 100644
--- a/settings_sample.py
+++ b/settings_sample.py
@@ -15,7 +15,7 @@ MANAGERS = ADMINS
 
 DATABASES = {
     "default" : {
-        "ENGINE" : "",
+        "ENGINE" : "django.db.backends.",
         "NAME" : "modoboa",
         "USER" : "",
         "PASSWORD" : "",
@@ -89,8 +89,8 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'modoboa.lib.middleware.AjaxLoginRedirect',
+    'modoboa.lib.middleware.CommonExceptionCatcher',
     'modoboa.lib.middleware.ExtControlMiddleware',
-    'modoboa.extensions.webmail.middleware.WebmailErrorMiddleware',
 )
 
 ROOT_URLCONF = 'modoboa.urls'