Abhilash Raj has proposed merging lp:~raj-abhilash1/postorius/domainowner into
lp:postorius.
Requested reviews:
Mailman Coders (mailman-coders)
For more details, see:
https://code.launchpad.net/~raj-abhilash1/postorius/domainowner/+merge/256242
Add options for serverowner in domain, remove `contact_address` for domains.
--
Your team Mailman Coders is requested to review the proposed merge of
lp:~raj-abhilash1/postorius/domainowner into lp:postorius.
=== modified file 'src/postorius/forms.py'
--- src/postorius/forms.py 2015-04-14 15:12:54 +0000
+++ src/postorius/forms.py 2015-04-14 22:09:57 +0000
@@ -40,9 +40,6 @@
description = forms.CharField(
label=_('Description'),
required=False)
- contact_address = forms.EmailField(
- label=_('Contact Address'),
- required=False)
def clean_mail_host(self):
mail_host = self.cleaned_data['mail_host']
=== modified file 'src/postorius/templates/postorius/domain_new.html'
--- src/postorius/templates/postorius/domain_new.html 2014-10-15 20:59:52 +0000
+++ src/postorius/templates/postorius/domain_new.html 2015-04-14 22:09:57 +0000
@@ -37,15 +37,6 @@
</div>
</div>
- <div class="control-group">
- {{ form.contact_address.errors }}
- <label for="id_contact_address" class="control-label">{% trans "Contact Address:" %}</label>
- <div class="controls">
- {{ form.contact_address}}
- <p class="help-block"><strong>{% trans "Example:" %}</strong> {% trans "[email protected]" %}</p>
- </div>
- </div>
-
<div class="form-actions">
<button class="btn btn-success btn-primary" type="submit">{% trans "Create Domain" %}</button>
</div>
=== modified file 'src/postorius/views/settings.py'
--- src/postorius/views/settings.py 2015-02-09 14:35:44 +0000
+++ src/postorius/views/settings.py 2015-04-14 22:09:57 +0000
@@ -72,7 +72,8 @@
if form.is_valid():
domain = Domain(mail_host=form.cleaned_data['mail_host'],
base_url=form.cleaned_data['web_host'],
- description=form.cleaned_data['description'])
+ description=form.cleaned_data['description'],
+ owner=request.user.email)
try:
domain.save()
except MailmanApiError:
_______________________________________________
Mailman-coders mailing list
[email protected]
https://mail.python.org/mailman/listinfo/mailman-coders
