fix mail forwarding setup bug
- fix wrong variable name in managemails.models.MailAddress.set_forward_addresses and typo in managemails.forms.EditMailAddressForm
This commit is contained in:
parent
78a11055f3
commit
2af30d6148
3 changed files with 7 additions and 3 deletions
|
@ -1,6 +1,10 @@
|
||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
* :bug:`-` fix wrong variable name in
|
||||||
|
managemails.models.MailAddress.set_forward_addresses and typo in
|
||||||
|
managemails.forms.EditMailAddressForm
|
||||||
|
|
||||||
* :release:`0.11.1 <2015-02-01>`
|
* :release:`0.11.1 <2015-02-01>`
|
||||||
* :bug:`-` fix translation of contact form by using ugettext_lazy and adding
|
* :bug:`-` fix translation of contact form by using ugettext_lazy and adding
|
||||||
contact_form to INSTALLED_APPS
|
contact_form to INSTALLED_APPS
|
||||||
|
|
|
@ -290,5 +290,5 @@ class EditMailAddressForm(forms.ModelForm, MailAddressFieldMixin):
|
||||||
self.instance.set_mailbox(data['mailbox'], commit)
|
self.instance.set_mailbox(data['mailbox'], commit)
|
||||||
elif data['mailbox_or_forwards'] == MAILBOX_OR_FORWARDS.forwards:
|
elif data['mailbox_or_forwards'] == MAILBOX_OR_FORWARDS.forwards:
|
||||||
targets = [part.strip() for part in data['forwards'].split(',')]
|
targets = [part.strip() for part in data['forwards'].split(',')]
|
||||||
self.instance.set_foward_addresses(targets, commit)
|
self.instance.set_forward_addresses(targets, commit)
|
||||||
return self.instance
|
return self.instance
|
||||||
|
|
|
@ -209,13 +209,13 @@ class MailAddress(ActivateAbleMixin, TimeStampedModel, models.Model):
|
||||||
mafwd = MailAddressForward(mailaddress=self, target=target)
|
mafwd = MailAddressForward(mailaddress=self, target=target)
|
||||||
if commit:
|
if commit:
|
||||||
mafwd.save()
|
mafwd.save()
|
||||||
retval.append(item)
|
retval.append(mafwd)
|
||||||
else:
|
else:
|
||||||
for target in addresses:
|
for target in addresses:
|
||||||
mafwd = MailAddressForward(mailaddress=self, target=target)
|
mafwd = MailAddressForward(mailaddress=self, target=target)
|
||||||
if commit:
|
if commit:
|
||||||
mafwd.save()
|
mafwd.save()
|
||||||
retval.append(item)
|
retval.append(mafwd)
|
||||||
return retval
|
return retval
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue