Merge lp:~cjwatson/launchpad/ppa-activation-mail-link into lp:launchpad

Proposed by Colin Watson on 2017-10-07
Status: Needs review
Proposed branch: lp:~cjwatson/launchpad/ppa-activation-mail-link
Merge into: lp:launchpad
Diff against target: 58 lines (+14/-1)
3 files modified
lib/lp/soyuz/doc/archivesubscriber.txt (+8/-0)
lib/lp/soyuz/emailtemplates/ppa-subscription-new.txt (+4/-0)
lib/lp/soyuz/mail/notifications.py (+2/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/ppa-activation-mail-link
Reviewer Review Type Date Requested Status
William Grant 2017-10-07 Needs Information on 2017-10-08
Review via email: mp+331983@code.launchpad.net

Commit message

Include a link to the archive in "PPA access granted" email notifications.

To post a comment you must log in.
William Grant (wgrant) wrote :

You usually *can't* see the packages that are in a private PPA to which you are merely subscribed. launchpad.LimitedView is weird.

review: Needs Information
Colin Watson (cjwatson) wrote :

Ah, hm, fair point - my test cases must have been bad. How about if we included that link only if you do have full launchpad.View access?

Unmerged revisions

18475. By Colin Watson on 2017-10-07

Include a link to the archive in "PPA access granted" email notifications.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/soyuz/doc/archivesubscriber.txt'
--- lib/lp/soyuz/doc/archivesubscriber.txt 2015-07-21 09:04:01 +0000
+++ lib/lp/soyuz/doc/archivesubscriber.txt 2017-10-07 03:19:01 +0000
@@ -125,6 +125,10 @@
125 <BLANKLINE>125 <BLANKLINE>
126 <http://launchpad.dev/~/+archivesubscriptions>126 <http://launchpad.dev/~/+archivesubscriptions>
127 <BLANKLINE>127 <BLANKLINE>
128 You can see what packages are published in this archive here:
129 <BLANKLINE>
130 <http://launchpad.dev/~cprov/+archive/ubuntu/p3a>
131 <BLANKLINE>
128 You can find out more about Celso Providelo here:132 You can find out more about Celso Providelo here:
129 <BLANKLINE>133 <BLANKLINE>
130 <http://launchpad.dev/~cprov>134 <http://launchpad.dev/~cprov>
@@ -161,6 +165,10 @@
161 <BLANKLINE>165 <BLANKLINE>
162 <http://launchpad.dev/~/+archivesubscriptions>166 <http://launchpad.dev/~/+archivesubscriptions>
163 <BLANKLINE>167 <BLANKLINE>
168 You can see what packages are published in this archive here:
169 <BLANKLINE>
170 <http://launchpad.dev/~cprov/+archive/ubuntu/p3a>
171 <BLANKLINE>
164 You can find out more about Celso Providelo here:172 You can find out more about Celso Providelo here:
165 <BLANKLINE>173 <BLANKLINE>
166 <http://launchpad.dev/~cprov>174 <http://launchpad.dev/~cprov>
167175
=== modified file 'lib/lp/soyuz/emailtemplates/ppa-subscription-new.txt'
--- lib/lp/soyuz/emailtemplates/ppa-subscription-new.txt 2011-12-18 23:30:56 +0000
+++ lib/lp/soyuz/emailtemplates/ppa-subscription-new.txt 2017-10-07 03:19:01 +0000
@@ -9,6 +9,10 @@
99
10<%(recipient_subscriptions_url)s>10<%(recipient_subscriptions_url)s>
1111
12You can see what packages are published in this archive here:
13
14<%(ppa_url)s>
15
12You can find out more about %(registrant_name)s here:16You can find out more about %(registrant_name)s here:
1317
14<%(registrant_profile_url)s>18<%(registrant_profile_url)s>
1519
=== modified file 'lib/lp/soyuz/mail/notifications.py'
--- lib/lp/soyuz/mail/notifications.py 2012-05-04 12:10:08 +0000
+++ lib/lp/soyuz/mail/notifications.py 2017-10-07 03:19:01 +0000
@@ -1,4 +1,4 @@
1# Copyright 2011 Canonical Ltd. This software is licensed under the1# Copyright 2011-2017 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).2# GNU Affero General Public License version 3 (see the file LICENSE).
33
4"""Event handlers that send email notifications."""4"""Event handlers that send email notifications."""
@@ -60,6 +60,7 @@
60 'ppa_displayname': ppa_displayname,60 'ppa_displayname': ppa_displayname,
61 'ppa_reference': ppa_reference,61 'ppa_reference': ppa_reference,
62 'ppa_description_blurb': description_blurb,62 'ppa_description_blurb': description_blurb,
63 'ppa_url': canonical_url(archive),
63 'recipient_subscriptions_url': recipient_subscriptions_url,64 'recipient_subscriptions_url': recipient_subscriptions_url,
64 }65 }
65 body = MailWrapper(72).format(template % replacements,66 body = MailWrapper(72).format(template % replacements,