From c2f67610578576bafe23c00a3d4d04c116200c91 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sun, 28 Sep 2014 15:27:13 +0200
Subject: [PATCH] Display missing tabs.

see #585
---
 modoboa/extensions/admin/forms/domain.py            | 6 ++++--
 modoboa/extensions/admin/templatetags/admin_tags.py | 2 +-
 modoboa/extensions/admin/urls.py                    | 1 +
 modoboa/extensions/admin/views/domain.py            | 3 ++-
 modoboa/lib/formutils.py                            | 2 ++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modoboa/extensions/admin/forms/domain.py b/modoboa/extensions/admin/forms/domain.py
index ac64ee087..3c5e7ab39 100644
--- a/modoboa/extensions/admin/forms/domain.py
+++ b/modoboa/extensions/admin/forms/domain.py
@@ -252,9 +252,11 @@ class DomainFormOptions(forms.Form):
 
 
 class DomainForm(TabForms):
-    """Domain edition form.
 
-    """
+    """Domain edition form."""
+
+    template_name = "admin/editdomainform.html"
+
     def __init__(self, request, *args, **kwargs):
         self.user = request.user
         self.forms = []
diff --git a/modoboa/extensions/admin/templatetags/admin_tags.py b/modoboa/extensions/admin/templatetags/admin_tags.py
index 2be237969..284705fd1 100644
--- a/modoboa/extensions/admin/templatetags/admin_tags.py
+++ b/modoboa/extensions/admin/templatetags/admin_tags.py
@@ -238,7 +238,7 @@ def domadmin_actions(daid, domid):
     actions = [{
         "name": "removeperm",
         "url": "{}?domid={}&daid={}".format(
-            reverse("admin:permission_delete"), domid, daid),
+            reverse("admin:permission_remove"), domid, daid),
         "img": "fa fa-trash",
         "title": _("Remove this permission")
     }]
diff --git a/modoboa/extensions/admin/urls.py b/modoboa/extensions/admin/urls.py
index 3022d309a..3756372a6 100644
--- a/modoboa/extensions/admin/urls.py
+++ b/modoboa/extensions/admin/urls.py
@@ -16,6 +16,7 @@ urlpatterns = patterns(
 
 urlpatterns += patterns(
     'modoboa.extensions.admin.views.identity',
+
     url(r'^permissions/remove/$', 'remove_permission',
         name="permission_remove"),
 
diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py
index e5518c456..289d705cf 100644
--- a/modoboa/extensions/admin/views/domain.py
+++ b/modoboa/extensions/admin/views/domain.py
@@ -100,7 +100,8 @@ def newdomain(request):
 @permission_required("admin.view_domains")
 @transaction.commit_on_success
 @reversion.create_revision()
-def editdomain(request, dom_id, tplname="admin/editdomainform.html"):
+def editdomain(request, dom_id):
+    """Edit domain view."""
     domain = Domain.objects.get(pk=dom_id)
     if not request.user.can_access(domain):
         raise PermDeniedException
diff --git a/modoboa/lib/formutils.py b/modoboa/lib/formutils.py
index 2dddd314b..9c75761b2 100644
--- a/modoboa/lib/formutils.py
+++ b/modoboa/lib/formutils.py
@@ -199,6 +199,7 @@ class DynamicForm(object):
 
 
 class TabForms(object):
+
     """
     Simple forms container
 
@@ -206,6 +207,7 @@ class TabForms(object):
     displayed using tabs. It is different from a classical formset
     because it can contain different forms.
     """
+
     template_name = "common/tabforms.html"
 
     def __init__(self, request, instances=None, classes=None):