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

[Colin Watson]

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

[William Grant (wgrant)]

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)]

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.

=== 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 @@
     <BLANKLINE>
     <http://launchpad.dev/~/+archivesubscriptions>
     <BLANKLINE>
+    You can see what packages are published in this archive here:
+    <BLANKLINE>
+    <http://launchpad.dev/~cprov/+archive/ubuntu/p3a>
+    <BLANKLINE>
     You can find out more about Celso Providelo here:
     <BLANKLINE>
     <http://launchpad.dev/~cprov>
@@ -161,6 +165,10 @@
     <BLANKLINE>
     <http://launchpad.dev/~/+archivesubscriptions>
     <BLANKLINE>
+    You can see what packages are published in this archive here:
+    <BLANKLINE>
+    <http://launchpad.dev/~cprov/+archive/ubuntu/p3a>
+    <BLANKLINE>
     You can find out more about Celso Providelo here:
     <BLANKLINE>
     <http://launchpad.dev/~cprov>
 
=== 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 @@
 
 <%(recipient_subscriptions_url)s>
 
+You can see what packages are published in this archive here:
+
+<%(ppa_url)s>
+
 You can find out more about %(registrant_name)s here:
 
 <%(registrant_profile_url)s>
 
=== 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 @@
-# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2011-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Event handlers that send email notifications."""
@@ -60,6 +60,7 @@
             'ppa_displayname': ppa_displayname,
             'ppa_reference': ppa_reference,
             'ppa_description_blurb': description_blurb,
+            'ppa_url': canonical_url(archive),
             'recipient_subscriptions_url': recipient_subscriptions_url,
             }
         body = MailWrapper(72).format(template % replacements,