diff --git a/modoboa/admin/callbacks.py b/modoboa/admin/callbacks.py index 094faa01c..3e6d6ef1a 100644 --- a/modoboa/admin/callbacks.py +++ b/modoboa/admin/callbacks.py @@ -27,10 +27,6 @@ PERMISSIONS = { ["admin", "alias", "delete_alias"], ["admin", "mailbox", "view_mailboxes"], ["admin", "alias", "view_aliases"], - ["admin", "domainalias", "view_domaliases"], - ["admin", "domainalias", "add_domainalias"], - ["admin", "domainalias", "change_domainalias"], - ["admin", "domainalias", "delete_domainalias"] ] } diff --git a/modoboa/admin/migrations/0002_migrate_from_modoboa_admin.py b/modoboa/admin/migrations/0002_migrate_from_modoboa_admin.py index 96527fae5..4c1202680 100644 --- a/modoboa/admin/migrations/0002_migrate_from_modoboa_admin.py +++ b/modoboa/admin/migrations/0002_migrate_from_modoboa_admin.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals from django.db import models, migrations -def rename_content_types(apps, schema_editor): - """Rename old content types if necessary.""" +def rename_and_clean(apps, schema_editor): + """Rename old content types if necessary, remove permissions.""" ContentType = apps.get_model("contenttypes", "ContentType") for ct in ContentType.objects.filter(app_label="admin"): try: @@ -17,6 +17,14 @@ def rename_content_types(apps, schema_editor): ct.delete() old_ct.save() + # Remove DomainAlias permissions from DomainAdmins group + Group = apps.get_model("auth", "Group") + Permission = apps.get_model("auth", "Permission") + group = Group.objects.get(name="DomainAdmins") + ct = ContentType.objects.get(app_label="admin", model="domainalias") + for permission in Permission.objects.filter(content_type=ct): + group.permissions.remove(permission) + class Migration(migrations.Migration): @@ -25,5 +33,5 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(rename_content_types), + migrations.RunPython(rename_and_clean), ] diff --git a/modoboa/core/__init__.py b/modoboa/core/__init__.py index 9da184959..7b9f6ba3f 100644 --- a/modoboa/core/__init__.py +++ b/modoboa/core/__init__.py @@ -1,4 +1,3 @@ -import os from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _, ugettext_lazy