diff --git a/src/postorius/forms.py b/src/postorius/forms.py index 536194a..036b8b8 100644 --- a/src/postorius/forms.py +++ b/src/postorius/forms.py @@ -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'] diff --git a/src/postorius/templates/postorius/domain_new.html b/src/postorius/templates/postorius/domain_new.html index a6b3685..ec9e57d 100644 --- a/src/postorius/templates/postorius/domain_new.html +++ b/src/postorius/templates/postorius/domain_new.html @@ -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 "postmaster@domain.org" %}</p> - </div> - </div> - <div class="form-actions"> <button class="btn btn-success btn-primary" type="submit">{% trans "Create Domain" %}</button> </div> diff --git a/src/postorius/views/settings.py b/src/postorius/views/settings.py index cd6cdf3..43e24f2 100644 --- a/src/postorius/views/settings.py +++ b/src/postorius/views/settings.py @@ -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: