Postorius

Merge lp:~raj-abhilash1/postorius/domainowner into lp:postorius

  1. domainowner
  2. Merge into trunk
Proposed by Abhilash Raj
Status: Merged
Merged at revision: 233
Proposed branch: lp:~raj-abhilash1/postorius/domainowner
Merge into: lp:postorius
Diff against target: 47 lines (+2/-13)
3 files modified
src/postorius/forms.py (+0/-3)
src/postorius/templates/postorius/domain_new.html (+0/-9)
src/postorius/views/settings.py (+2/-1)
To merge this branch: bzr merge lp:~raj-abhilash1/postorius/domainowner
Reviewer Review Type Date Requested Status
Terri Approve
Review via email: mp+256242@code.launchpad.net

Description of the change

Add options for serverowner in domain, remove `contact_address` for domains.

To post a comment you must log in.
Revision history for this message
Terri (terriko) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/postorius/forms.py'
2--- src/postorius/forms.py 2015-04-14 15:12:54 +0000
3+++ src/postorius/forms.py 2015-04-14 22:09:57 +0000
4@@ -40,9 +40,6 @@
5 description = forms.CharField(
6 label=_('Description'),
7 required=False)
8- contact_address = forms.EmailField(
9- label=_('Contact Address'),
10- required=False)
11
12 def clean_mail_host(self):
13 mail_host = self.cleaned_data['mail_host']
14
15=== modified file 'src/postorius/templates/postorius/domain_new.html'
16--- src/postorius/templates/postorius/domain_new.html 2014-10-15 20:59:52 +0000
17+++ src/postorius/templates/postorius/domain_new.html 2015-04-14 22:09:57 +0000
18@@ -37,15 +37,6 @@
19 </div>
20 </div>
21
22- <div class="control-group">
23- {{ form.contact_address.errors }}
24- <label for="id_contact_address" class="control-label">{% trans "Contact Address:" %}</label>
25- <div class="controls">
26- {{ form.contact_address}}
27- <p class="help-block"><strong>{% trans "Example:" %}</strong> {% trans "postmaster@domain.org" %}</p>
28- </div>
29- </div>
30-
31 <div class="form-actions">
32 <button class="btn btn-success btn-primary" type="submit">{% trans "Create Domain" %}</button>
33 </div>
34
35=== modified file 'src/postorius/views/settings.py'
36--- src/postorius/views/settings.py 2015-02-09 14:35:44 +0000
37+++ src/postorius/views/settings.py 2015-04-14 22:09:57 +0000
38@@ -72,7 +72,8 @@
39 if form.is_valid():
40 domain = Domain(mail_host=form.cleaned_data['mail_host'],
41 base_url=form.cleaned_data['web_host'],
42- description=form.cleaned_data['description'])
43+ description=form.cleaned_data['description'],
44+ owner=request.user.email)
45 try:
46 domain.save()
47 except MailmanApiError:

Subscribers

People subscribed via source and target branches