From b469b78e3db35374de1dd7dc34835c8b8bfb0f53 Mon Sep 17 00:00:00 2001
From: tonio <devnull@localhost>
Date: Tue, 25 May 2010 09:15:28 +0200
Subject: [PATCH] #40 : Alias modification updated.

---
 admin/views.py               | 9 +++++----
 templates/admin/aliases.html | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/admin/views.py b/admin/views.py
index 2138019fc..41f53e746 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -321,14 +321,15 @@ def editalias(request, dom_id, alias_id):
         error = None
         if form.is_valid():
             if alias.address != request.POST["address"] \
-                    and Alias.objects.filter(address=request.POST["address"],
-                                             mbox=alias.mbox.id):
-                error = _("Alias with this address already exists")
+                    and Alias.objects.filter(address=request.POST["address"]):
+                error = _("Alias with this name already exists")
             else:
+                domain = Domain.objects.get(pk=dom_id)
                 alias = form.save(commit=False)
                 alias.full_address = "%s@%s" % (alias.address, 
-                                                alias.mbox.domain.name)
+                                                domain.name)
                 alias.save()
+                form.save_m2m()
                 ctx = _ctx_ok(reverse(admin.views.aliases, args=[dom_id]))
                 return HttpResponse(simplejson.dumps(ctx), 
                                     mimetype="application/json")
diff --git a/templates/admin/aliases.html b/templates/admin/aliases.html
index 36701a7a8..64de11a68 100644
--- a/templates/admin/aliases.html
+++ b/templates/admin/aliases.html
@@ -20,7 +20,7 @@
     <td>
       {% url admin.views.editalias domain.id alias.id as edit_url %}
       <a href="{{ edit_url }}" class="boxed"
-         rel="{handler:'iframe',size:{x:300,y:190}}">
+         rel="{handler:'iframe',size:{x:300,y:250}}">
         <img src="/static/pics/edit.png" border="0" title="{% trans 'Edit alias' %}"/>
       </a>
       {% url admin.views.delalias domain.id alias.id as del_url %}