From 11f4a7de60356146e346b371558ceac01f65f88d Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Tue, 22 Sep 2015 10:47:23 +0000 Subject: [PATCH] Added bounces mailbox to phplist SaaS service --- orchestra/contrib/saas/services/phplist.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/orchestra/contrib/saas/services/phplist.py b/orchestra/contrib/saas/services/phplist.py index 7d73632e..a97721e0 100644 --- a/orchestra/contrib/saas/services/phplist.py +++ b/orchestra/contrib/saas/services/phplist.py @@ -17,6 +17,14 @@ from .options import SoftwareService class PHPListForm(SaaSPasswordForm): admin_username = forms.CharField(label=_("Admin username"), required=False, widget=SpanWidget(display='admin')) + database = forms.CharField(label=_("Database"), required=False, + help_text=_("Database used for this instance."), + widget=SpanWidget(display=settings.SAAS_PHPLIST_DB_NAME.replace( + '%(', '<').replace(')s', '>'))) + mailbox = forms.CharField(label=_("Bounces mailbox"), required=False, + help_text=_("Mailbox used for reciving bounces."), + widget=SpanWidget(display=settings.SAAS_PHPLIST_BOUNCES_MAILBOX_NAME.replace( + '%(', '<').replace(')s', '>'))) def __init__(self, *args, **kwargs): super(PHPListForm, self).__init__(*args, **kwargs) @@ -27,11 +35,6 @@ class PHPListForm(SaaSPasswordForm): class PHPListChangeForm(PHPListForm): - database = forms.CharField(label=_("Database"), required=False, - help_text=_("Database used for this instance.")) - mailbox = forms.CharField(label=_("Bounces mailbox"), required=False, - help_text=_("Mailbox used for reciving bounces."), widget=SpanWidget(display='')) - def __init__(self, *args, **kwargs): super(PHPListChangeForm, self).__init__(*args, **kwargs) site_domain = self.instance.get_site_domain()