From 83c4d9c5ac8b6d45176ee0bd5d6a24a79e4a8fbb Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 18 Oct 2013 16:45:15 +0200
Subject: [PATCH] Fixes.

see #491
---
 modoboa/extensions/admin/tables.py            | 41 +------------------
 modoboa/extensions/amavis/__init__.py         |  1 +
 .../postfix_relay_domains/models.py           |  2 +-
 3 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/modoboa/extensions/admin/tables.py b/modoboa/extensions/admin/tables.py
index 6ab552161..d8f4f1c8d 100644
--- a/modoboa/extensions/admin/tables.py
+++ b/modoboa/extensions/admin/tables.py
@@ -1,45 +1,6 @@
 # coding: utf-8
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import ugettext_lazy
 from modoboa.lib import tables
-from templatetags.admin_tags import domain_actions
-
-
-class DomainsTable(tables.Table):
-    tableid = "objects_table"
-    idkey = "id"
-    styles = "table"
-
-    name = tables.LinkColumn(
-        "name", label=ugettext_lazy("Name"),
-        urlpattern="modoboa.extensions.admin.views.domain.editdomain",
-        title=_("Edit domain"), modal=True, modalcb="admin.domainform_cb",
-        sortable=True, sort_order="name"
-    )
-    domaliases = tables.Column(
-        "domainalias_set", label=ugettext_lazy("Alias(es)"), safe=True,
-        sortable=True, sort_order="domainalias__name"
-    )
-    actions = tables.ActionColumn("actions", label=ugettext_lazy("Actions"),
-                                  defvalue=domain_actions)
-
-    cols_order = ["name", "domaliases", "actions"]
-
-    def __init__(self, request, doms):
-        super(DomainsTable, self).__init__(request)
-        self.populate(self._rows_from_model(doms))
-
-    def parse_domainalias_set(self, aliases):
-        if not len(aliases.all()):
-            return "---"
-        res = ""
-        for da in aliases.all():
-            res += "%s<br/>" % da.name
-        return res
-
-    def row_class(self, request, domain):
-        if not domain.enabled:
-            return "muted"
-        return ""
 
 
 class ExtensionsTable(tables.Table):
diff --git a/modoboa/extensions/amavis/__init__.py b/modoboa/extensions/amavis/__init__.py
index a376a9a34..b5013daa9 100644
--- a/modoboa/extensions/amavis/__init__.py
+++ b/modoboa/extensions/amavis/__init__.py
@@ -114,6 +114,7 @@ $(document).ready(function() {
             }
         }
     });
+});
 </script>
 """)
         return [tpl.render(
diff --git a/modoboa/extensions/postfix_relay_domains/models.py b/modoboa/extensions/postfix_relay_domains/models.py
index 58a3012c4..34a78106d 100644
--- a/modoboa/extensions/postfix_relay_domains/models.py
+++ b/modoboa/extensions/postfix_relay_domains/models.py
@@ -48,7 +48,7 @@ class ServiceManager(Manager):
         for service in self.all():
             if not service.name in services:
                 to_delete.append(service.name)
-        Service.objects.filter(name__in=to_delete()).delete()
+        Service.objects.filter(name__in=to_delete).delete()
 
 
 class Service(models.Model):