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
1=== modified file 'lib/lp/soyuz/doc/archivesubscriber.txt'
2--- lib/lp/soyuz/doc/archivesubscriber.txt 2015-07-21 09:04:01 +0000
3+++ lib/lp/soyuz/doc/archivesubscriber.txt 2017-10-07 03:19:01 +0000
4@@ -125,6 +125,10 @@
5 <BLANKLINE>
6 <http://launchpad.dev/~/+archivesubscriptions>
7 <BLANKLINE>
8+ You can see what packages are published in this archive here:
9+ <BLANKLINE>
10+ <http://launchpad.dev/~cprov/+archive/ubuntu/p3a>
11+ <BLANKLINE>
12 You can find out more about Celso Providelo here:
13 <BLANKLINE>
14 <http://launchpad.dev/~cprov>
15@@ -161,6 +165,10 @@
16 <BLANKLINE>
17 <http://launchpad.dev/~/+archivesubscriptions>
18 <BLANKLINE>
19+ You can see what packages are published in this archive here:
20+ <BLANKLINE>
21+ <http://launchpad.dev/~cprov/+archive/ubuntu/p3a>
22+ <BLANKLINE>
23 You can find out more about Celso Providelo here:
24 <BLANKLINE>
25 <http://launchpad.dev/~cprov>
26
27=== modified file 'lib/lp/soyuz/emailtemplates/ppa-subscription-new.txt'
28--- lib/lp/soyuz/emailtemplates/ppa-subscription-new.txt 2011-12-18 23:30:56 +0000
29+++ lib/lp/soyuz/emailtemplates/ppa-subscription-new.txt 2017-10-07 03:19:01 +0000
30@@ -9,6 +9,10 @@
31
32 <%(recipient_subscriptions_url)s>
33
34+You can see what packages are published in this archive here:
35+
36+<%(ppa_url)s>
37+
38 You can find out more about %(registrant_name)s here:
39
40 <%(registrant_profile_url)s>
41
42=== modified file 'lib/lp/soyuz/mail/notifications.py'
43--- lib/lp/soyuz/mail/notifications.py 2012-05-04 12:10:08 +0000
44+++ lib/lp/soyuz/mail/notifications.py 2017-10-07 03:19:01 +0000
45@@ -1,4 +1,4 @@
46-# Copyright 2011 Canonical Ltd. This software is licensed under the
47+# Copyright 2011-2017 Canonical Ltd. This software is licensed under the
48 # GNU Affero General Public License version 3 (see the file LICENSE).
49
50 """Event handlers that send email notifications."""
51@@ -60,6 +60,7 @@
52 'ppa_displayname': ppa_displayname,
53 'ppa_reference': ppa_reference,
54 'ppa_description_blurb': description_blurb,
55+ 'ppa_url': canonical_url(archive),
56 'recipient_subscriptions_url': recipient_subscriptions_url,
57 }
58 body = MailWrapper(72).format(template % replacements,