First fixes for 0.8-rc1.

* The bigger one concerns fixtures. As django 1.2 resolves it by implementing natural keys, it's becoming a requirement.
* There was also problems 0002_auto__del_field_alias_mbox, my bad...
* It was possible to create aliases that point to addresses of other domains!
* Some path problems in the stats module.
* Some path problems with the autoreply.
This commit is contained in:
tonio
2010-06-17 17:42:41 +02:00
parent 7705e70140
commit 233e695a55
10 changed files with 68 additions and 59 deletions
+1 -1
View File
@@ -1 +1 @@
[{"pk": 1, "model": "auth.group", "fields": {"name": "DomainAdmins", "permissions": [36, 37, 38, 40, 41, 42, 34, 39, 43]}}]
[{"pk": 1, "model": "auth.group", "fields": {"name": "DomainAdmins", "permissions": [["add_mailbox", "admin", "mailbox"], ["change_mailbox", "admin", "mailbox"], ["delete_mailbox", "admin", "mailbox"], ["add_alias", "admin", "alias"], ["change_alias", "admin", "alias"], ["delete_alias", "admin", "alias"], ["view_domain", "admin", "domain"], ["view_mailboxes", "admin", "mailbox"], ["view_aliases", "admin", "alias"]]}}]
@@ -5,7 +5,7 @@ from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
no_dry_dun = True
no_dry_run = True
def forwards(self, orm):
@@ -18,7 +18,7 @@ class Migration(SchemaMigration):
db.create_unique('admin_alias_mboxes', ['alias_id', 'mailbox_id'])
for alias in orm.Alias.objects.all():
alias.mboxes.append(alias.mbox_id)
alias.mboxes.add(alias.mbox_id)
alias.save()
# Deleting field 'Alias.mbox'
+3 -3
View File
@@ -287,14 +287,14 @@ def aliases(request, dom_id=None, mbox_id=None):
@good_domain
@permission_required("admin.add_alias")
def newalias(request, dom_id):
domain = Domain.objects.get(pk=dom_id)
if request.method == "POST":
form = AliasForm(request.POST)
form = AliasForm(request.POST, domain=domain)
error = None
if form.is_valid():
if 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, domain.name)
alias.save()
@@ -307,7 +307,7 @@ def newalias(request, dom_id):
})
return HttpResponse(simplejson.dumps(ctx), mimetype="application/json")
form = AliasForm()
form = AliasForm(domain=domain)
return render_to_response('admin/newalias.html', {
"domain" : dom_id, "form" : form, "noerrors" : True
})