Merge lp:~adeuring/launchpad/bug-598484 into lp:launchpad/db-devel

[Abel Deuring]

This branch fixes bug 598484 which I caused in my branch for bug 583385. I simply forgot that IHasBugs was not only implemented by IBugTarget and IPerson, but also by IProjectGroup.

So I added another ZCML directive that defines the currently missing page again for project groups.

test: ./bin/test -t xx-bug-text-pages.txt

no lint

[Abel Deuring (adeuring)]

wrong target branch...

review: Disapprove

=== modified file '.bzrignore'
--- .bzrignore	2010-05-27 07:12:50 +0000
+++ .bzrignore	2010-06-25 13:39:35 +0000
@@ -68,3 +68,4 @@
 lp.sfood
 apidocs
 twistd.pid
+lib/canonical/launchpad/apidoc

=== modified file 'Makefile'
--- Makefile	2010-06-15 01:52:28 +0000
+++ Makefile	2010-06-25 13:39:35 +0000
@@ -61,8 +61,7 @@
 $(API_INDEX): $(BZR_VERSION_INFO)
 	mkdir -p $(APIDOC_DIR).tmp
 	LPCONFIG=$(LPCONFIG) $(PY) ./utilities/create-lp-wadl-and-apidoc.py "$(WADL_TEMPLATE)"
-	mv $(APIDOC_DIR).tmp/* $(APIDOC_DIR)
-	rmdir $(APIDOC_DIR).tmp
+	mv $(APIDOC_DIR).tmp $(APIDOC_DIR)
 
 apidoc: compile $(API_INDEX)
 
@@ -340,7 +339,7 @@
 	$(RM) -r lib/mailman
 	$(RM) -rf lib/canonical/launchpad/icing/build/*
 	$(RM) -r $(CODEHOSTING_ROOT)
-	$(RM) $(APIDOC_DIR)/wadl*.xml $(APIDOC_DIR)/*.html
+	$(RM) -rf $(APIDOC_DIR)
 	$(RM) -rf $(APIDOC_DIR).tmp
 	$(RM) $(BZR_VERSION_INFO)
 	$(RM) +config-overrides.zcml

=== removed directory 'lib/canonical/launchpad/apidoc'
=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in	2010-06-17 00:39:03 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in	2010-06-25 13:39:35 +0000
@@ -126,6 +126,20 @@
    Universal presentation
    Block elements.
 */
+/* XXX EdwinGrubbs 2010-06-18 bug=570354
+ * The PrettyOverlay css uses static values for the width, but
+ * the overlay needs to stretch for forms with wide input fields.
+ */
+.yui-pretty-overlay {
+    width: auto !important;
+    min-width: 402px;
+    }
+
+.yui-pretty-overlay #yui-pretty-overlay-modal {
+    width: auto !important;
+    min-width: 340px;
+    }
+
 html, body {
     font-family: "dejavu sans", "bitstream vera sans", verdana, sans-serif;
     font-size: 93%;

=== renamed directory 'lib/lp/bugs/javascript' => 'lib/canonical/launchpad/javascript/bugs'
=== modified file 'lib/canonical/launchpad/mailnotification.py'
--- lib/canonical/launchpad/mailnotification.py	2010-06-23 21:24:13 +0000
+++ lib/canonical/launchpad/mailnotification.py	2010-06-25 13:39:35 +0000
@@ -16,157 +16,50 @@
 from email.MIMEText import MIMEText
 from email.MIMEMultipart import MIMEMultipart
 from email.MIMEMessage import MIMEMessage
-from email.Utils import formataddr, formatdate, make_msgid
+from email.Utils import formataddr, make_msgid
 
 import re
-import rfc822
 
 from zope.component import getAdapter, getUtility
-from zope.interface import implements
 
 from canonical.config import config
 from canonical.database.sqlbase import block_implicit_flushes
-from lp.bugs.adapters.bugdelta import BugDelta
-from lp.bugs.adapters.bugchange import (
-    BugDuplicateChange, get_bug_changes, BugTaskAssigneeChange)
 from canonical.launchpad.helpers import (
-    get_contact_email_addresses, get_email_template, shortlist)
+    get_contact_email_addresses, get_email_template)
 from canonical.launchpad.interfaces import (
-    IEmailAddressSet, IHeldMessageDetails, ILaunchpadCelebrities,
-    IPerson, IPersonSet, ISpecification, IStructuralSubscriptionTarget,
-    ITeamMembershipSet, IUpstreamBugTask, TeamMembershipStatus)
-from lp.bugs.interfaces.bugchange import IBugChange
+    IHeldMessageDetails, IPerson, IPersonSet, ISpecification,
+    IStructuralSubscriptionTarget, ITeamMembershipSet, IUpstreamBugTask,
+    TeamMembershipStatus)
 from canonical.launchpad.interfaces.launchpad import ILaunchpadRoot
 from canonical.launchpad.interfaces.message import (
     IDirectEmailAuthorization, QuotaReachedError)
-from lp.registry.interfaces.structuralsubscription import (
-    BugNotificationLevel)
 from canonical.launchpad.mail import (
     sendmail, simple_sendmail, simple_sendmail_from_person, format_address)
-from lp.services.mail.mailwrapper import MailWrapper
 from canonical.launchpad.webapp.publisher import canonical_url
 from canonical.launchpad.webapp.url import urlappend
 
+from lp.bugs.adapters.bugdelta import BugDelta
+from lp.bugs.adapters.bugchange import (
+    BugDuplicateChange, get_bug_changes, BugTaskAssigneeChange)
+from lp.bugs.interfaces.bugchange import IBugChange
+from lp.bugs.mail.bugnotificationbuilder import get_bugmail_error_address
+from lp.registry.interfaces.structuralsubscription import (
+    BugNotificationLevel)
+from lp.services.mail.mailwrapper import MailWrapper
+
 # XXX 2010-06-16 gmb bug=594985
 #     This shouldn't be here, but if we take it out lots of things cry,
 #     which is sad.
 from lp.services.mail.notificationrecipientset import (
     NotificationRecipientSet)
 
+from lp.bugs.mail.bugnotificationbuilder import (
+    BugNotificationBuilder)
 from lp.bugs.mail.bugnotificationrecipients import BugNotificationRecipients
 
 CC = "CC"
 
 
-def format_rfc2822_date(date):
-    """Formats a date according to RFC2822's desires."""
-    return formatdate(rfc822.mktime_tz(date.utctimetuple() + (0, )))
-
-
-class BugNotificationBuilder:
-    """Constructs a MIMEText message for a bug notification.
-
-    Takes a bug and a set of headers and returns a new MIMEText
-    object. Common and expensive to calculate headers are cached
-    up-front.
-    """
-
-    def __init__(self, bug):
-        self.bug = bug
-
-        # Pre-calculate common headers.
-        self.common_headers = [
-            ('Reply-To', get_bugmail_replyto_address(bug)),
-            ('Sender', config.canonical.bounce_address),
-            ]
-
-        # X-Launchpad-Bug
-        self.common_headers.extend(
-            ('X-Launchpad-Bug', bugtask.asEmailHeaderValue())
-            for bugtask in bug.bugtasks)
-
-        # X-Launchpad-Bug-Tags
-        if len(bug.tags) > 0:
-            self.common_headers.append(
-                ('X-Launchpad-Bug-Tags', ' '.join(bug.tags)))
-
-        # Add the X-Launchpad-Bug-Private header. This is a simple
-        # yes/no value denoting privacy for the bug.
-        if bug.private:
-            self.common_headers.append(
-                ('X-Launchpad-Bug-Private', 'yes'))
-        else:
-            self.common_headers.append(
-                ('X-Launchpad-Bug-Private', 'no'))
-
-        # Add the X-Launchpad-Bug-Security-Vulnerability header to
-        # denote security for this bug. This follows the same form as
-        # the -Bug-Private header.
-        if bug.security_related:
-            self.common_headers.append(
-                ('X-Launchpad-Bug-Security-Vulnerability', 'yes'))
-        else:
-            self.common_headers.append(
-                ('X-Launchpad-Bug-Security-Vulnerability', 'no'))
-
-        # Add the -Bug-Commenters header, a space-separated list of
-        # distinct IDs of people who have commented on the bug. The
-        # list is sorted to aid testing.
-        commenters = set(message.owner.name for message in bug.messages)
-        self.common_headers.append(
-            ('X-Launchpad-Bug-Commenters', ' '.join(sorted(commenters))))
-
-        # Add the -Bug-Reporter header to identify the owner of the bug
-        # and the original bug task for filtering
-        self.common_headers.append(
-            ('X-Launchpad-Bug-Reporter',
-             '%s (%s)' % ( bug.owner.displayname, bug.owner.name )))
-
-    def build(self, from_address, to_address, body, subject, email_date,
-              rationale=None, references=None, message_id=None):
-        """Construct the notification.
-
-        :param from_address: The From address of the notification.
-        :param to_address: The To address for the notification.
-        :param body: The body text of the notification.
-        :type body: unicode
-        :param subject: The Subject of the notification.
-        :param email_date: The Date for the notification.
-        :param rationale: The rationale for why the recipient is
-            receiving this notification.
-        :param references: A value for the References header.
-        :param message_id: A value for the Message-ID header.
-
-        :return: An `email.MIMEText.MIMEText` object.
-        """
-        message = MIMEText(body.encode('utf8'), 'plain', 'utf8')
-        message['Date'] = format_rfc2822_date(email_date)
-        message['From'] = from_address
-        message['To'] = to_address
-
-        # Add the common headers.
-        for header in self.common_headers:
-            message.add_header(*header)
-
-        if references is not None:
-            message['References'] = ' '.join(references)
-        if message_id is not None:
-            message['Message-Id'] = message_id
-
-        subject_prefix = "[Bug %d]" % self.bug.id
-        if subject is None:
-            message['Subject'] = subject_prefix
-        elif subject_prefix in subject:
-            message['Subject'] = subject
-        else:
-            message['Subject'] = "%s %s" % (subject_prefix, subject)
-
-        if rationale is not None:
-            message.add_header('X-Launchpad-Message-Rationale', rationale)
-
-        return message
-
-
 def _send_bug_details_to_new_bug_subscribers(
     bug, previous_subscribers, current_subscribers, subscribed_by=None,
     event_creator=None):
@@ -234,65 +127,12 @@
     if (bugtask_before_modification.product !=
         bugtask_after_modification.product):
         new_product = bugtask_after_modification.product
-        if bugtask_before_modification.bug.security_related and new_product.security_contact:
+        if (bugtask_before_modification.bug.security_related and
+            new_product.security_contact):
             bugtask_after_modification.bug.subscribe(
                 new_product.security_contact, IPerson(event.user))
 
 
-def get_bugmail_from_address(person, bug):
-    """Returns the right From: address to use for a bug notification."""
-    if person == getUtility(ILaunchpadCelebrities).janitor:
-        return format_address(
-            'Launchpad Bug Tracker',
-            "%s@%s" % (bug.id, config.launchpad.bugs_domain))
-
-    if person.hide_email_addresses:
-        return format_address(
-            person.displayname,
-            "%s@%s" % (bug.id, config.launchpad.bugs_domain))
-
-    if person.preferredemail is not None:
-        return format_address(person.displayname, person.preferredemail.email)
-
-    # XXX: Bjorn Tillenius 2006-04-05:
-    # The person doesn't have a preferred email set, but he
-    # added a comment (either via the email UI, or because he was
-    # imported as a deaf reporter). It shouldn't be possible to use the
-    # email UI if you don't have a preferred email set, but work around
-    # it for now by trying hard to find the right email address to use.
-    email_addresses = shortlist(
-        getUtility(IEmailAddressSet).getByPerson(person))
-    if not email_addresses:
-        # XXX: Bjorn Tillenius 2006-05-21 bug=33427:
-        # A user should always have at least one email address,
-        # but due to bug #33427, this isn't always the case.
-        return format_address(person.displayname,
-            "%s@%s" % (bug.id, config.launchpad.bugs_domain))
-
-    # At this point we have no validated emails to use: if any of the
-    # person's emails had been validated the preferredemail would be
-    # set. Since we have no idea of which email address is best to use,
-    # we choose the first one.
-    return format_address(person.displayname, email_addresses[0].email)
-
-
-def get_bugmail_replyto_address(bug):
-    """Return an appropriate bugmail Reply-To address.
-
-    :bug: the IBug.
-
-    :user: an IPerson whose name will appear in the From address, e.g.:
-
-        From: Foo Bar via Malone <123@bugs...>
-    """
-    return u"Bug %d <%s@%s>" % (bug.id, bug.id, config.launchpad.bugs_domain)
-
-
-def get_bugmail_error_address():
-    """Return a suitable From address for a bug transaction error email."""
-    return config.malone.bugmail_error_from_address
-
-
 def send_process_error_notification(to_address, subject, error_msg,
                                     original_msg, failing_command=None):
     """Send a mail about an error occurring while using the email interface.

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-06-16 18:49:47 +0000
+++ lib/canonical/launchpad/security.py	2010-06-25 13:39:35 +0000
@@ -19,7 +19,7 @@
     IArchivePermissionSet)
 from lp.soyuz.interfaces.archiveauthtoken import IArchiveAuthToken
 from lp.soyuz.interfaces.archivesubscriber import (
-    IArchiveSubscriber, IPersonalArchiveSubscription)
+    IArchiveSubscriber, IArchiveSubscriberSet, IPersonalArchiveSubscription)
 from lp.code.interfaces.branch import (
     IBranch, user_has_special_branch_access)
 from lp.code.interfaces.branchmergeproposal import (
@@ -2040,6 +2040,13 @@
         if self.obj.is_ppa and self.obj.checkArchivePermission(user.person):
             return True
 
+        # Subscribers can view private PPAs.
+        if self.obj.is_ppa and self.obj.private:
+            archive_subs = getUtility(IArchiveSubscriberSet).getBySubscriber(
+                user.person, self.obj).any()
+            if archive_subs:
+                return True
+
         return False
 
     def checkUnauthenticated(self):

=== modified file 'lib/canonical/launchpad/webapp/launchpadform.py'
--- lib/canonical/launchpad/webapp/launchpadform.py	2010-03-15 16:58:49 +0000
+++ lib/canonical/launchpad/webapp/launchpadform.py	2010-06-25 13:39:35 +0000
@@ -16,6 +16,7 @@
     ]
 
 import transaction
+
 from zope.interface import classImplements, providedBy
 from zope.interface.advice import addClassAdvisor
 from zope.event import notify
@@ -243,7 +244,7 @@
         self.errors.append(cleanmsg)
 
     @staticmethod
-    def validate_none(self, action, data):
+    def validate_none(form, action, data):
         """Do not do any validation.
 
         This is to be used in subclasses that have actions in which no
@@ -473,6 +474,10 @@
         if referrer is None:
             # "referer" is misspelled in the HTTP specification.
             referrer = self.request.getHeader('referer')
+            # Windmill doesn't pass in a correct referer.
+            if (referrer is not None
+                and '/windmill-serv/remote.html' in referrer):
+                referrer = None
         else:
             attribute_name = self.request.form.get('_return_attribute_name')
             attribute_value = self.request.form.get('_return_attribute_value')

=== modified file 'lib/canonical/widgets/popup.py'
--- lib/canonical/widgets/popup.py	2010-01-29 10:52:58 +0000
+++ lib/canonical/widgets/popup.py	2010-06-25 13:39:35 +0000
@@ -180,6 +180,56 @@
         return '/people/'
 
 
+class BugTrackerPickerWidget(VocabularyPickerWidget):
+    link_template = """
+        or (<a id="%(activator_id)s" href="/bugs/bugtrackers/+newbugtracker"
+                    >Register an external bug tracker&hellip;</a>)
+        <script>
+        LPS.use('lp.bugs.bugtracker_overlay', function(Y) {
+            if (Y.UA.ie) {
+                return;
+            }
+            Y.on('domready', function () {
+                // After the success handler finishes, it calls the
+                // next_step function.
+                var next_step = function(bug_tracker) {
+                    // Fill in the text field with either the name of
+                    // the newly created bug tracker or the name of an
+                    // existing bug tracker whose base_url matches.
+                    var bugtracker_text_box = Y.one(
+                        Y.DOM.byId('field.bugtracker.bugtracker'));
+                    if (bugtracker_text_box !== null) {
+                        bugtracker_text_box.set(
+                            'value', bug_tracker.get('name'));
+                        // It doesn't appear possible to use onChange
+                        // event, so the onKeyPress event is explicitely
+                        // fired here.
+                        if (bugtracker_text_box.get('onkeypress')) {
+                            bugtracker_text_box.get('onkeypress')();
+                        }
+                        bugtracker_text_box.scrollIntoView();
+                    }
+                }
+                Y.lp.bugs.bugtracker_overlay.attach_widget({
+                    activate_node: Y.get('#%(activator_id)s'),
+                    next_step: next_step
+                    });
+                });
+        });
+        </script>
+        """
+
+    def chooseLink(self):
+        link = super(BugTrackerPickerWidget, self).chooseLink()
+        link += self.link_template % dict(
+            activator_id='create-bugtracker-link')
+        return link
+
+    @property
+    def nonajax_uri(self):
+        return '/bugs/bugtrackers/'
+
+
 class SearchForUpstreamPopupWidget(VocabularyPickerWidget):
     """A SinglePopupWidget with a custom error message.
 

=== modified file 'lib/canonical/widgets/product.py'
--- lib/canonical/widgets/product.py	2010-06-16 16:56:58 +0000
+++ lib/canonical/widgets/product.py	2010-06-25 13:39:35 +0000
@@ -37,7 +37,7 @@
 from canonical.launchpad.webapp import canonical_url
 from canonical.widgets.itemswidgets import (
     CheckBoxMatrixWidget, LaunchpadRadioWidget)
-from canonical.widgets.popup import  VocabularyPickerWidget
+from canonical.widgets.popup import BugTrackerPickerWidget
 from canonical.widgets.textwidgets import (
     LowerCaseTextWidget, StrippedTextWidget)
 from lp.registry.interfaces.product import IProduct
@@ -57,7 +57,7 @@
         self.bugtracker = Choice(
             vocabulary="WebBugTracker",
             __name__='bugtracker')
-        self.bugtracker_widget = CustomWidgetFactory(VocabularyPickerWidget)
+        self.bugtracker_widget = CustomWidgetFactory(BugTrackerPickerWidget)
         setUpWidget(
             self, 'bugtracker', self.bugtracker, IInputWidget,
             prefix=self.name, value=field.context.bugtracker,
@@ -82,7 +82,7 @@
         if self.upstream_email_address_widget.extra is None:
             self.upstream_email_address_widget.extra = ''
         self.upstream_email_address_widget.extra += (
-            ' onkeypress="selectWidget(\'%s.3\', event);"' % self.name)
+            ''' onkeypress="selectWidget('%s.3', event);"\n''' % self.name)
 
     def _renderItem(self, index, text, value, name, cssClass, checked=False):
         # This form has a custom need to render their labels separately,
@@ -192,7 +192,7 @@
             self.upstream_email_address_widget.setRenderedValue(
                 value.baseurl.lstrip('mailto:'))
         external_bugtracker_email_text = "%s %s" % (
-            self._renderLabel("By emailing an upstream bug contact:", 3),
+            self._renderLabel("By emailing an upstream bug contact:\n", 3),
             self.upstream_email_address_widget())
         external_bugtracker_email_arguments = dict(
             index=3, text=external_bugtracker_email_text,

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2010-06-17 19:25:53 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2010-06-25 13:39:35 +0000
@@ -181,6 +181,8 @@
     <script type="text/javascript"
             tal:attributes="src string:${lp_js}/lp/mapping.js"></script>
     <script type="text/javascript"
+            tal:attributes="src string:${lp_js}/bugs/bugtracker_overlay.js"></script>
+    <script type="text/javascript"
             tal:attributes="src string:${lp_js}/registry/milestoneoverlay.js"></script>
     <script type="text/javascript"
             tal:attributes="src string:${lp_js}/registry/milestonetable.js"></script>

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2010-06-07 19:48:29 +0000
+++ lib/lp/bugs/browser/bug.py	2010-06-25 13:39:35 +0000
@@ -58,9 +58,10 @@
 from lp.bugs.interfaces.cve import ICveSet
 from lp.bugs.interfaces.bugattachment import IBugAttachmentSet
 from lp.bugs.interfaces.bugnomination import IBugNominationSet
+from lp.bugs.mail.bugnotificationbuilder import format_rfc2822_date
 
 from canonical.launchpad.mailnotification import (
-    MailWrapper, format_rfc2822_date)
+    MailWrapper)
 from canonical.launchpad.searchbuilder import any, greater_than
 from canonical.launchpad.webapp import (
     ContextMenu, LaunchpadEditFormView, LaunchpadFormView, LaunchpadView,

=== modified file 'lib/lp/bugs/browser/bugtracker.py'
--- lib/lp/bugs/browser/bugtracker.py	2009-09-04 08:17:15 +0000
+++ lib/lp/bugs/browser/bugtracker.py	2010-06-25 13:39:35 +0000
@@ -82,8 +82,8 @@
     page_title = u"Register an external bug tracker"
     schema = IBugTracker
     label = page_title
-    field_names = ['name', 'bugtrackertype', 'title', 'summary',
-                   'baseurl', 'contactdetails']
+    field_names = ['bugtrackertype', 'name', 'title', 'baseurl', 'summary',
+                   'contactdetails']
 
     def setUpWidgets(self, context=None):
         # We only show those bug tracker types for which there can be

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2010-06-18 10:41:48 +0000
+++ lib/lp/bugs/browser/configure.zcml	2010-06-25 13:39:35 +0000
@@ -59,6 +59,12 @@
             name="+bugs-text"
             attribute="__call__"/>
         <browser:page
+            for="lp.registry.interfaces.projectgroup.IProjectGroup"
+            class="lp.bugs.browser.bugtask.TextualBugTaskSearchListingView"
+            permission="zope.Public"
+            name="+bugs-text"
+            attribute="__call__"/>
+        <browser:page
             for="lp.bugs.interfaces.bugtarget.IHasBugs"
             class="lp.bugs.browser.bugtask.BugTaskSearchListingView"
             permission="zope.Public"

=== modified file 'lib/lp/bugs/doc/bugnotification-email.txt'
--- lib/lp/bugs/doc/bugnotification-email.txt	2010-06-23 21:24:13 +0000
+++ lib/lp/bugs/doc/bugnotification-email.txt	2010-06-25 13:39:35 +0000
@@ -424,7 +424,7 @@
 The Reply-To: and From: addresses used to send email are generated in a
 pair of handy functions defined in mailnotification.py:
 
-    >>> from canonical.launchpad.mailnotification import (
+    >>> from lp.bugs.mail.bugnotificationbuilder import (
     ...     get_bugmail_from_address, get_bugmail_replyto_address)
 
 The Reply-To address generation is straightforward:

=== modified file 'lib/lp/bugs/interfaces/bugtarget.py'
--- lib/lp/bugs/interfaces/bugtarget.py	2010-06-18 07:54:36 +0000
+++ lib/lp/bugs/interfaces/bugtarget.py	2010-06-25 13:39:35 +0000
@@ -21,7 +21,7 @@
     ]
 
 from zope.interface import Interface, Attribute
-from zope.schema import Bool, Choice, List, Object, Text, TextLine
+from zope.schema import Bool, Choice, Datetime, List, Object, Text, TextLine
 
 from canonical.launchpad import _
 from canonical.launchpad.fields import Tag
@@ -164,7 +164,13 @@
             title=(
                 u"Search for bugs that are linked to branches or for bugs "
                 "that are not linked to branches."),
-            vocabulary=BugBranchSearch, required=False))
+            vocabulary=BugBranchSearch, required=False),
+        modified_since=Datetime(
+            title=(
+                u"Search for bugs that have been modified since the given "
+                "date."),
+            required=False),
+        )
     @operation_returns_collection_of(IBugTask)
     @export_read_operation()
     def searchTasks(search_params, user=None,
@@ -186,7 +192,7 @@
                     hardware_owner_is_affected_by_bug=False,
                     hardware_owner_is_subscribed_to_bug=False,
                     hardware_is_linked_to_bug=False, linked_branches=None,
-                    structural_subscriber=None):
+                    structural_subscriber=None, modified_since=None):
         """Search the IBugTasks reported on this entity.
 
         :search_params: a BugTaskSearchParams object

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2010-06-08 14:54:22 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2010-06-25 13:39:35 +0000
@@ -478,6 +478,12 @@
                                "Confirmed."),
                  readonly=True,
                  required=False))
+    date_incomplete = exported(
+        Datetime(title=_("Date Incomplete"),
+                 description=_("The date on which this task was marked "
+                               "Incomplete."),
+                 readonly=True,
+                 required=False))
     date_inprogress = exported(
         Datetime(title=_("Date In Progress"),
                  description=_("The date on which this task was marked "
@@ -1084,8 +1090,8 @@
                  hardware_owner_is_affected_by_bug=False,
                  hardware_owner_is_subscribed_to_bug=False,
                  hardware_is_linked_to_bug=False,
-                 linked_branches=None, structural_subscriber=None
-                 ):
+                 linked_branches=None, structural_subscriber=None,
+                 modified_since=None):
 
         self.bug = bug
         self.searchtext = searchtext
@@ -1130,6 +1136,7 @@
         self.hardware_is_linked_to_bug = hardware_is_linked_to_bug
         self.linked_branches = linked_branches
         self.structural_subscriber = structural_subscriber
+        self.modified_since = None
 
     def setProduct(self, product):
         """Set the upstream context on which to filter the search."""
@@ -1203,7 +1210,7 @@
                        hardware_owner_is_affected_by_bug=False,
                        hardware_owner_is_subscribed_to_bug=False,
                        hardware_is_linked_to_bug=False, linked_branches=None,
-                       structural_subscriber=None):
+                       structural_subscriber=None, modified_since=None):
         """Create and return a new instance using the parameter list."""
         search_params = cls(user=user, orderby=order_by)
 
@@ -1272,6 +1279,7 @@
             hardware_is_linked_to_bug)
         search_params.linked_branches=linked_branches
         search_params.structural_subscriber = structural_subscriber
+        search_params.modified_since = modified_since
 
         return search_params
 

=== modified file 'lib/lp/bugs/interfaces/bugtracker.py'
--- lib/lp/bugs/interfaces/bugtracker.py	2010-04-15 08:45:31 +0000
+++ lib/lp/bugs/interfaces/bugtracker.py	2010-06-25 13:39:35 +0000
@@ -68,7 +68,8 @@
         bugtracker = getUtility(IBugTrackerSet).queryByBaseURL(input)
         if bugtracker is not None and bugtracker != self.context:
             raise LaunchpadValidationError(
-                "%s is already registered in Launchpad." % input)
+                '%s is already registered in Launchpad as "%s" (%s).'
+                % (input, bugtracker.title, bugtracker.name))
 
 
 class BugTrackerType(DBEnumeratedType):
@@ -183,7 +184,7 @@
         BugTrackerNameField(
             title=_('Name'),
             constraint=name_validator,
-            description=_('An URL-friendly name for the bug tracker, '
+            description=_('A URL-friendly name for the bug tracker, '
                           'such as "mozilla-bugs".')))
     title = exported(
         TextLine(

=== added directory 'lib/lp/bugs/javascript'
=== added file 'lib/lp/bugs/javascript/bugtracker_overlay.js'
--- lib/lp/bugs/javascript/bugtracker_overlay.js	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/javascript/bugtracker_overlay.js	2010-06-25 13:39:35 +0000
@@ -0,0 +1,131 @@
+/* Copyright 2010 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * A bugtracker form overlay that can create a bugtracker within any page.
+ *
+ * @namespace Y.lp.bugs.bugtracker_overlay
+ * @requires  dom, node, io-base, lazr.anim, lazr.formoverlay
+ */
+YUI.add('lp.bugs.bugtracker_overlay', function(Y) {
+    Y.log('loading lp.bugs.bugtracker_overlay');
+    var namespace = Y.namespace('lp.bugs.bugtracker_overlay');
+
+    var bugtracker_form;
+    var next_step;
+
+    var save_new_bugtracker = function(data) {
+
+        var parameters = {
+            bug_tracker_type: data['field.bugtrackertype'][0],
+            name: data['field.name'][0].toLowerCase(),
+            title: data['field.title'][0],
+            base_url: data['field.baseurl'][0],
+            summary: data['field.summary'][0],
+            contact_details: data['field.contactdetails'][0]
+        };
+
+        var finish_new_bugtracker = function(entry) {
+            bugtracker_form.clearError();
+            bugtracker_form.hide();
+            // Reset the HTML form inside the widget.
+            bugtracker_form.get('contentBox').one('form').reset();
+            next_step(entry);
+        };
+
+        var client = new LP.client.Launchpad();
+        client.named_post('/bugs/bugtrackers', 'ensureBugTracker', {
+            parameters: parameters,
+            on: {
+                success: finish_new_bugtracker,
+                failure: function (ignore, response, args) {
+                    var error_box = Y.one('#bugtracker-error');
+                    var error_message = response.statusText + '\n\n' +
+                                        response.responseText;
+                    bugtracker_form.showError(error_message);
+                    // XXX EdwinGrubbs 2007-06-18 bug=596025
+                    // This should be done by FormOverlay.showError().
+                    bugtracker_form.error_node.scrollIntoView();
+                }
+            }
+        });
+    };
+
+
+    var setup_bugtracker_form = function () {
+        var form_submit_button = Y.Node.create(
+            '<input type="submit" name="field.actions.register" ' +
+            'id="formoverlay-add-bugtracker" value="Create bug tracker"/>');
+        bugtracker_form = new Y.lazr.FormOverlay({
+            headerContent: '<h2>Create Bug Tracker</h2>',
+            form_submit_button: form_submit_button,
+            centered: true,
+            form_submit_callback: save_new_bugtracker,
+            visible: false
+        });
+        bugtracker_form.loadFormContentAndRender(
+                '/bugs/bugtrackers/+newbugtracker/++form++');
+        // XXX EdwinGrubbs 2010-06-18 bug=596130
+        // render() and show() will actually be called before the
+        // asynchronous io call finishes, so the widget appears first
+        // without any content. However, this is better than loading the
+        // form every time the page loads despite the form overlay being
+        // used rarely.
+        bugtracker_form.render();
+        bugtracker_form.show();
+    };
+
+    var show_bugtracker_form = function(e) {
+        e.preventDefault();
+        if (bugtracker_form) {
+            bugtracker_form.show();
+        } else {
+            // This function call is asynchronous, so we can move
+            // bugtracker_form.show() below it.
+            setup_bugtracker_form();
+        }
+
+        // XXX EdwinGrubbs 2010-06-18 bug=596113
+        // FormOverlay calls centered(), which can cause this tall form
+        // to be position where the top of the form is no longer
+        // accessible.
+        var bounding_box = bugtracker_form.get('boundingBox');
+        var min_top = 10;
+        if (bounding_box.get('offsetTop') < min_top) {
+            bounding_box.setStyle('top', min_top + 'px');
+        }
+    };
+
+    /**
+      * Attaches a bugtracker form overlay widget to an element.
+      *
+      * @method attach_widget
+      * @param {Object} config Object literal of config name/value pairs.
+      *                        activate_node is the node that shows the form
+      *                            when it is clicked.
+      *                        next_step is the function to be called after
+      *                            the bugtracker is created.
+      */
+    namespace.attach_widget = function(config) {
+        Y.log('lp.bugs.bugtracker_overlay.attach_widget()');
+        if (Y.UA.ie) {
+            return;
+        }
+        if (config === undefined) {
+            throw new Error(
+                "Missing attach_widget config for bugtracker_overlay.");
+        }
+        if (config.activate_node === undefined ||
+            config.next_step === undefined) {
+            throw new Error(
+                "attach_widget config for bugtracker_overlay has " +
+                "undefined properties.");
+        }
+        next_step = config.next_step;
+        Y.log('lp.bugs.bugtracker_overlay.attach_widget() setup onclick');
+        config.activate_node.addClass('js-action');
+        config.activate_node.on('click', show_bugtracker_form);
+    };
+
+}, "0.1", {"requires": [
+    "dom", "node", "io-base", "lazr.anim", "lazr.formoverlay", "lp.calendar"
+    ]});

=== added directory 'lib/lp/bugs/javascript/tests'
=== added file 'lib/lp/bugs/mail/bugnotificationbuilder.py'
--- lib/lp/bugs/mail/bugnotificationbuilder.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/mail/bugnotificationbuilder.py	2010-06-25 13:39:35 +0000
@@ -0,0 +1,187 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Bug notification building code."""
+
+__metaclass__ = type
+__all__ = [
+    'BugNotificationBuilder',
+    'format_rfc2822_date',
+    'get_bugmail_error_address',
+    'get_bugmail_from_address',
+    ]
+
+import rfc822
+from email.MIMEText import MIMEText
+from email.Utils import formatdate
+
+from zope.component import getUtility
+
+from canonical.config import config
+from canonical.launchpad.helpers import shortlist
+from canonical.launchpad.interfaces.emailaddress import IEmailAddressSet
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+from canonical.launchpad.mail import format_address
+
+
+def format_rfc2822_date(date):
+    """Formats a date according to RFC2822's desires."""
+    return formatdate(rfc822.mktime_tz(date.utctimetuple() + (0, )))
+
+
+def get_bugmail_from_address(person, bug):
+    """Returns the right From: address to use for a bug notification."""
+    if person == getUtility(ILaunchpadCelebrities).janitor:
+        return format_address(
+            'Launchpad Bug Tracker',
+            "%s@%s" % (bug.id, config.launchpad.bugs_domain))
+
+    if person.hide_email_addresses:
+        return format_address(
+            person.displayname,
+            "%s@%s" % (bug.id, config.launchpad.bugs_domain))
+
+    if person.preferredemail is not None:
+        return format_address(person.displayname, person.preferredemail.email)
+
+    # XXX: Bjorn Tillenius 2006-04-05:
+    # The person doesn't have a preferred email set, but he
+    # added a comment (either via the email UI, or because he was
+    # imported as a deaf reporter). It shouldn't be possible to use the
+    # email UI if you don't have a preferred email set, but work around
+    # it for now by trying hard to find the right email address to use.
+    email_addresses = shortlist(
+        getUtility(IEmailAddressSet).getByPerson(person))
+    if not email_addresses:
+        # XXX: Bjorn Tillenius 2006-05-21 bug=33427:
+        # A user should always have at least one email address,
+        # but due to bug #33427, this isn't always the case.
+        return format_address(person.displayname,
+            "%s@%s" % (bug.id, config.launchpad.bugs_domain))
+
+    # At this point we have no validated emails to use: if any of the
+    # person's emails had been validated the preferredemail would be
+    # set. Since we have no idea of which email address is best to use,
+    # we choose the first one.
+    return format_address(person.displayname, email_addresses[0].email)
+
+
+def get_bugmail_replyto_address(bug):
+    """Return an appropriate bugmail Reply-To address.
+
+    :bug: the IBug.
+
+    :user: an IPerson whose name will appear in the From address, e.g.:
+
+        From: Foo Bar via Malone <123@bugs...>
+    """
+    return u"Bug %d <%s@%s>" % (bug.id, bug.id, config.launchpad.bugs_domain)
+
+
+def get_bugmail_error_address():
+    """Return a suitable From address for a bug transaction error email."""
+    return config.malone.bugmail_error_from_address
+
+
+class BugNotificationBuilder:
+    """Constructs a MIMEText message for a bug notification.
+
+    Takes a bug and a set of headers and returns a new MIMEText
+    object. Common and expensive to calculate headers are cached
+    up-front.
+    """
+
+    def __init__(self, bug):
+        self.bug = bug
+
+        # Pre-calculate common headers.
+        self.common_headers = [
+            ('Reply-To', get_bugmail_replyto_address(bug)),
+            ('Sender', config.canonical.bounce_address),
+            ]
+
+        # X-Launchpad-Bug
+        self.common_headers.extend(
+            ('X-Launchpad-Bug', bugtask.asEmailHeaderValue())
+            for bugtask in bug.bugtasks)
+
+        # X-Launchpad-Bug-Tags
+        if len(bug.tags) > 0:
+            self.common_headers.append(
+                ('X-Launchpad-Bug-Tags', ' '.join(bug.tags)))
+
+        # Add the X-Launchpad-Bug-Private header. This is a simple
+        # yes/no value denoting privacy for the bug.
+        if bug.private:
+            self.common_headers.append(
+                ('X-Launchpad-Bug-Private', 'yes'))
+        else:
+            self.common_headers.append(
+                ('X-Launchpad-Bug-Private', 'no'))
+
+        # Add the X-Launchpad-Bug-Security-Vulnerability header to
+        # denote security for this bug. This follows the same form as
+        # the -Bug-Private header.
+        if bug.security_related:
+            self.common_headers.append(
+                ('X-Launchpad-Bug-Security-Vulnerability', 'yes'))
+        else:
+            self.common_headers.append(
+                ('X-Launchpad-Bug-Security-Vulnerability', 'no'))
+
+        # Add the -Bug-Commenters header, a space-separated list of
+        # distinct IDs of people who have commented on the bug. The
+        # list is sorted to aid testing.
+        commenters = set(message.owner.name for message in bug.messages)
+        self.common_headers.append(
+            ('X-Launchpad-Bug-Commenters', ' '.join(sorted(commenters))))
+
+        # Add the -Bug-Reporter header to identify the owner of the bug
+        # and the original bug task for filtering
+        self.common_headers.append(
+            ('X-Launchpad-Bug-Reporter',
+             '%s (%s)' % ( bug.owner.displayname, bug.owner.name )))
+
+    def build(self, from_address, to_address, body, subject, email_date,
+              rationale=None, references=None, message_id=None):
+        """Construct the notification.
+
+        :param from_address: The From address of the notification.
+        :param to_address: The To address for the notification.
+        :param body: The body text of the notification.
+        :type body: unicode
+        :param subject: The Subject of the notification.
+        :param email_date: The Date for the notification.
+        :param rationale: The rationale for why the recipient is
+            receiving this notification.
+        :param references: A value for the References header.
+        :param message_id: A value for the Message-ID header.
+
+        :return: An `email.MIMEText.MIMEText` object.
+        """
+        message = MIMEText(body.encode('utf8'), 'plain', 'utf8')
+        message['Date'] = format_rfc2822_date(email_date)
+        message['From'] = from_address
+        message['To'] = to_address
+
+        # Add the common headers.
+        for header in self.common_headers:
+            message.add_header(*header)
+
+        if references is not None:
+            message['References'] = ' '.join(references)
+        if message_id is not None:
+            message['Message-Id'] = message_id
+
+        subject_prefix = "[Bug %d]" % self.bug.id
+        if subject is None:
+            message['Subject'] = subject_prefix
+        elif subject_prefix in subject:
+            message['Subject'] = subject
+        else:
+            message['Subject'] = "%s %s" % (subject_prefix, subject)
+
+        if rationale is not None:
+            message.add_header('X-Launchpad-Message-Rationale', rationale)
+
+        return message

=== modified file 'lib/lp/bugs/model/bugtarget.py'
--- lib/lp/bugs/model/bugtarget.py	2010-06-11 09:41:07 +0000
+++ lib/lp/bugs/model/bugtarget.py	2010-06-25 13:39:35 +0000
@@ -65,7 +65,8 @@
                     hardware_owner_is_bug_reporter=None,
                     hardware_owner_is_affected_by_bug=False,
                     hardware_owner_is_subscribed_to_bug=False,
-                    hardware_is_linked_to_bug=False, linked_branches=None):
+                    hardware_is_linked_to_bug=False, linked_branches=None,
+                    modified_since=None):
         """See `IHasBugs`."""
         if status is None:
             # If no statuses are supplied, default to the

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2010-06-23 22:39:15 +0000
+++ lib/lp/bugs/model/bugtask.py	2010-06-25 13:39:35 +0000
@@ -1833,6 +1833,11 @@
             # we don't need to add any clause.
             pass
 
+        if params.modified_since:
+            extra_clauses.append(
+                "Bug.date_last_updated > %s" % (
+                    sqlvalues(params.modified_since,)))
+
         orderby_arg = self._processOrderBy(params)
 
         query = " AND ".join(extra_clauses)

=== modified file 'lib/lp/bugs/scripts/bugnotification.py'
--- lib/lp/bugs/scripts/bugnotification.py	2009-11-17 17:33:28 +0000
+++ lib/lp/bugs/scripts/bugnotification.py	2010-06-25 13:39:35 +0000
@@ -16,8 +16,9 @@
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.interfaces.person import IPersonSet
 from canonical.launchpad.mailnotification import (
-    generate_bug_add_email, MailWrapper, BugNotificationBuilder,
-    get_bugmail_from_address)
+    generate_bug_add_email, MailWrapper)
+from lp.bugs.mail.bugnotificationbuilder import (
+    BugNotificationBuilder, get_bugmail_from_address)
 from canonical.launchpad.scripts.logger import log
 from canonical.launchpad.webapp import canonical_url
 

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt	2010-06-03 21:49:47 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-text-pages.txt	2010-06-25 13:39:35 +0000
@@ -281,6 +281,14 @@
     >>> print anon_browser.contents
     10
 
+This page is also available for project groups.
+
+    >>> anon_browser.open('http://launchpad.dev/mozilla/+bugs-text')
+    >>> print anon_browser.contents
+    15
+    5
+    4
+
 
 == Private bugs ==
 

=== modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt'
--- lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt	2010-06-16 15:56:08 +0000
+++ lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt	2010-06-25 13:39:35 +0000
@@ -72,7 +72,8 @@
   >>> for message in find_tags_by_class(user_browser.contents, 'message'):
   ...     print extract_text(message)
   There is 1 error.
-  http://bugzilla.mozilla.org/ is already registered in Launchpad.
+  http://bugzilla.mozilla.org/ is already registered in Launchpad
+  as "The Mozilla.org Bug Tracker" (mozilla.org).
 
 The same happens if the requested URL is aliased to another bug
 tracker. Aliases can be edited once a bug tracker has been added, but
@@ -94,7 +95,8 @@
   >>> for message in find_tags_by_class(user_browser.contents, 'message'):
   ...     print extract_text(message)
   There is 1 error.
-  http://alias.example.com/ is already registered in Launchpad.
+  http://alias.example.com/ is already registered in Launchpad
+  as "GnomeGBug GTracker" (gnome-bugzilla).
 
 After successfully registering the bug tracker, the user is redirected
 to the bug tracker page.
@@ -201,7 +203,8 @@
   >>> for message in get_feedback_messages(user_browser.contents):
   ...     print message
   There is 1 error.
-  http://bugzilla.mozilla.org/ is already registered in Launchpad.
+  http://bugzilla.mozilla.org/ is already registered in Launchpad
+  as "The Mozilla.org Bug Tracker" (mozilla.org).
 
 If the user inadvertently enters an invalid URL, they are shown an
 informative error message explaining why it is invalid.
@@ -304,7 +307,8 @@
   >>> for message in get_feedback_messages(user_browser.contents):
   ...     print message
   There is 1 error.
-  http://bugzilla.mozilla.org/ is already registered in Launchpad.
+  http://bugzilla.mozilla.org/ is already registered in Launchpad
+  as "The Mozilla.org Bug Tracker" (mozilla.org).
 
 Multiple aliases can be entered by separating URLs with whitespace.
 

=== modified file 'lib/lp/bugs/stories/webservice/xx-bug.txt'
--- lib/lp/bugs/stories/webservice/xx-bug.txt	2010-06-10 18:55:22 +0000
+++ lib/lp/bugs/stories/webservice/xx-bug.txt	2010-06-25 13:39:35 +0000
@@ -327,6 +327,7 @@
   date_fix_committed: None
   date_fix_released: None
   date_in_progress: None
+  date_incomplete: None
   date_left_closed: None
   date_left_new: None
   date_triaged: None
@@ -1436,6 +1437,15 @@
     total_size: 0
     ---
 
+It can also be used to find bugs modified since a certain date.
+
+    >>> pprint_collection(webservice.named_get(
+    ...     '/ubuntu', 'searchTasks',
+    ...     modified_since=u'2011-01-01T00:00:00+00:00').jsonBody())
+    start: None
+    total_size: 0
+    ---
+
 It is possible to search for bugs targeted to a milestone within a
 project group.
 

=== modified file 'lib/lp/bugs/tests/test_bugtask.py'
--- lib/lp/bugs/tests/test_bugtask.py	2010-06-21 18:09:47 +0000
+++ lib/lp/bugs/tests/test_bugtask.py	2010-06-25 13:39:35 +0000
@@ -3,6 +3,7 @@
 
 __metaclass__ = type
 
+from datetime import timedelta
 import unittest
 
 from zope.component import getUtility
@@ -14,8 +15,10 @@
 from lp.hardwaredb.interfaces.hwdb import HWBus, IHWDeviceSet
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.searchbuilder import all, any
-from canonical.testing import LaunchpadFunctionalLayer, LaunchpadZopelessLayer
+from canonical.testing import (
+    DatabaseFunctionalLayer, LaunchpadFunctionalLayer, LaunchpadZopelessLayer)
 
+from lp.bugs.interfaces.bugtarget import IBugTarget
 from lp.bugs.interfaces.bugtask import (
     BugTaskImportance, BugTaskSearchParams, BugTaskStatus)
 from lp.bugs.model.bugtask import build_tag_search_clause
@@ -28,7 +31,7 @@
 
 class TestBugTaskDelta(TestCaseWithFactory):
 
-    layer = LaunchpadFunctionalLayer
+    layer = DatabaseFunctionalLayer
 
     def setUp(self):
         super(TestBugTaskDelta, self).setUp()
@@ -66,7 +69,6 @@
 
     def test_get_bugwatch_delta(self):
         # Exercise getDelta() with a change to bugwatch.
-        user = self.factory.makePerson()
         bug_task = self.factory.makeBugTask()
         bug_task_before_modification = Snapshot(
             bug_task, providing=providedBy(bug_task))
@@ -501,9 +503,9 @@
             [bugtask.bug.id for bugtask in bugtasks])
 
 
-class TestBugTaskPermissionsToSetAssigneeBase(TestCaseWithFactory):
+class TestBugTaskPermissionsToSetAssigneeMixin:
 
-    layer = LaunchpadFunctionalLayer
+    layer = DatabaseFunctionalLayer
 
     def setUp(self):
         """Create the test setup.
@@ -516,7 +518,7 @@
           owners, bug supervisors, drivers
         - bug tasks for the targets
         """
-        super(TestBugTaskPermissionsToSetAssigneeBase, self).setUp()
+        super(TestBugTaskPermissionsToSetAssigneeMixin, self).setUp()
         self.target_owner_member = self.factory.makePerson()
         self.target_owner_team = self.factory.makeTeam(
             owner=self.target_owner_member)
@@ -556,6 +558,14 @@
         self.target_bugtask.transitionToAssignee(self.regular_user)
         logout()
 
+    def makeTarget(self):
+        """Create a target and a series.
+
+        The target and series must be assigned as attributes of self:
+        'self.target' and 'self.series'.
+        """
+        raise NotImplementedError(self.makeTarget)
+
     def test_userCanSetAnyAssignee_anonymous_user(self):
         # Anonymous users cannot set anybody as an assignee.
         login(ANONYMOUS)
@@ -700,7 +710,7 @@
 
 
 class TestProductBugTaskPermissionsToSetAssignee(
-    TestBugTaskPermissionsToSetAssigneeBase):
+    TestBugTaskPermissionsToSetAssigneeMixin, TestCaseWithFactory):
 
     def makeTarget(self):
         """Create a product and a product series."""
@@ -709,7 +719,7 @@
 
 
 class TestDistributionBugTaskPermissionsToSetAssignee(
-    TestBugTaskPermissionsToSetAssigneeBase):
+    TestBugTaskPermissionsToSetAssigneeMixin, TestCaseWithFactory):
 
     def makeTarget(self):
         """Create a distribution and a distroseries."""
@@ -718,14 +728,73 @@
         self.series = self.factory.makeDistroSeries(self.target)
 
 
+class TestBugTaskSearch(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def login(self):
+        # Log in as an arbitrary person.
+        person = self.factory.makePerson()
+        login_person(person)
+        self.addCleanup(logout)
+        return person
+
+    def makeBugTarget(self):
+        """Make an arbitrary bug target with no tasks on it."""
+        return IBugTarget(self.factory.makeProduct())
+
+    def test_no_tasks(self):
+        # A brand new bug target has no tasks.
+        target = self.makeBugTarget()
+        self.assertEqual([], list(target.searchTasks(None)))
+
+    def test_new_task_shows_up(self):
+        # When we create a new bugtask on the target, it shows up in
+        # searchTasks.
+        target = self.makeBugTarget()
+        self.login()
+        task = self.factory.makeBugTask(target=target)
+        self.assertEqual([task], list(target.searchTasks(None)))
+
+    def test_modified_since_excludes_earlier_bugtasks(self):
+        # When we search for bug tasks that have been modified since a certain
+        # time, tasks for bugs that have not been modified since then are
+        # excluded.
+        target = self.makeBugTarget()
+        self.login()
+        task = self.factory.makeBugTask(target=target)
+        date = task.bug.date_last_updated + timedelta(days=1)
+        result = target.searchTasks(None, modified_since=date)
+        self.assertEqual([], list(result))
+
+    def test_modified_since_includes_later_bugtasks(self):
+        # When we search for bug tasks that have been modified since a certain
+        # time, tasks for bugs that have been modified since then are
+        # included.
+        target = self.makeBugTarget()
+        self.login()
+        task = self.factory.makeBugTask(target=target)
+        date = task.bug.date_last_updated - timedelta(days=1)
+        result = target.searchTasks(None, modified_since=date)
+        self.assertEqual([task], list(result))
+
+    def test_modified_since_includes_later_bugtasks_excludes_earlier(self):
+        # When we search for bugs that have been modified since a certain
+        # time, tasks for bugs that have been modified since then are
+        # included, tasks that have not are excluded.
+        target = self.makeBugTarget()
+        self.login()
+        task1 = self.factory.makeBugTask(target=target)
+        date = task1.bug.date_last_updated
+        task1.bug.date_last_updated -= timedelta(days=1)
+        task2 = self.factory.makeBugTask(target=target)
+        task2.bug.date_last_updated += timedelta(days=1)
+        result = target.searchTasks(None, modified_since=date)
+        self.assertEqual([task2], list(result))
+
+
 def test_suite():
     suite = unittest.TestSuite()
-    suite.addTest(unittest.makeSuite(TestBugTaskDelta))
-    suite.addTest(unittest.makeSuite(TestBugTaskTagSearchClauses))
-    suite.addTest(unittest.makeSuite(TestBugTaskHardwareSearch))
-    suite.addTest(unittest.makeSuite(
-        TestProductBugTaskPermissionsToSetAssignee))
-    suite.addTest(unittest.makeSuite(
-        TestDistributionBugTaskPermissionsToSetAssignee))
+    suite.addTest(unittest.TestLoader().loadTestsFromName(__name__))
     suite.addTest(DocTestSuite('lp.bugs.model.bugtask'))
     return suite

=== modified file 'lib/lp/registry/javascript/milestoneoverlay.js'
--- lib/lp/registry/javascript/milestoneoverlay.js	2010-04-29 15:21:05 +0000
+++ lib/lp/registry/javascript/milestoneoverlay.js	2010-06-25 13:39:35 +0000
@@ -71,7 +71,8 @@
         milestone_form.show();
     };
 
-    show_milestone_form = function(e) {
+    var show_milestone_form = function(e) {
+        e.preventDefault();
         if (milestone_form) {
             milestone_form.show();
         } else {
@@ -79,7 +80,6 @@
             // milestone_form.show() below it.
             setup_milestone_form();
         }
-        e.preventDefault();
     };
 
     /**

=== added file 'lib/lp/registry/windmill/tests/test_add_bugtracker.py'
--- lib/lp/registry/windmill/tests/test_add_bugtracker.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/windmill/tests/test_add_bugtracker.py	2010-06-25 13:39:35 +0000
@@ -0,0 +1,100 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test adding bug tracker in formoverlay."""
+
+__metaclass__ = type
+__all__ = []
+
+import unittest
+
+from canonical.launchpad.windmill.testing import lpuser
+
+from lp.registry.windmill.testing import RegistryWindmillLayer
+from lp.testing import WindmillTestCase
+
+
+def test_inline_add_bugtracker(client, url, name=None, suite='bugtracker',
+                               user=lpuser.FOO_BAR):
+    """Test the form overlay for adding a bugtracker.
+
+    :param name: Name of the test.
+    :param url: Starting url.
+    :param suite: The suite in which this test is part of.
+    :param user: The user who should be logged in.
+    """
+    bugtracker_name = u'FOObar'
+    title = u'\xdf-title-%s' % bugtracker_name
+    location = u'http://example.com/%s' % bugtracker_name
+
+    user.ensure_login(client)
+    client.open(url=url)
+    client.waits.forPageLoad(timeout=u'20000')
+
+    client.waits.forElement(id=u'create-bugtracker-link')
+
+    # Click the "Create external bug tracker" link.
+    client.click(id=u'create-bugtracker-link')
+
+    # Submit bugtracker form.
+    client.waits.forElement(id=u'field.name')
+    client.type(id='field.name', text=bugtracker_name)
+    client.type(id='field.title', text=title)
+    client.type(id='field.baseurl', text=location)
+    client.click(id=u'formoverlay-add-bugtracker')
+
+    # Verify that the bugtracker name was entered in the text box.
+    client.waits.sleep(milliseconds='1000')
+    client.asserts.assertProperty(
+        id="field.bugtracker.bugtracker",
+        validator='value|%s' % bugtracker_name.lower())
+    client.asserts.assertChecked(id="field.bugtracker.2")
+
+    # Verify error message when trying to create a bugtracker with a
+    # conflicting name.
+    client.click(id=u'create-bugtracker-link')
+    client.waits.forElement(id=u'field.name')
+    client.type(id='field.name', text=bugtracker_name)
+    client.click(id=u'formoverlay-add-bugtracker')
+    client.waits.forElement(
+        xpath="//div[contains(@class, 'yui-lazr-formoverlay-errors')]/ul/li")
+    client.asserts.assertTextIn(
+        classname='yui-lazr-formoverlay-errors',
+        validator='name: %s is already in use' % bugtracker_name.lower())
+    client.click(classname='close-button')
+
+    # Configure bug tracker for the project.
+    client.click(id=u'field.actions.change')
+
+    # You should now be on the project index page.
+    client.waits.forElement(
+        xpath="//a[contains(@class, 'menu-link-configure_bugtracker')]")
+    client.click(
+        xpath="//a[contains(@class, 'menu-link-configure_bugtracker')]")
+
+    # Verify that the new bug tracker was configured for this project.
+    client.waits.forElement(id="field.bugtracker.bugtracker")
+    client.asserts.assertProperty(
+        id="field.bugtracker.bugtracker",
+        validator='value|%s' % bugtracker_name.lower())
+    client.asserts.assertChecked(id="field.bugtracker.2")
+
+
+class TestAddBugTracker(WindmillTestCase):
+    """Test form overlay widget for adding a bug tracker."""
+
+    # This test doesn't run well in the BugsWindmillLayer, since
+    # submitting the +configure-bugtracker form takes you back to
+    # the project index page, which is not on the bugs.launchpad.dev.
+    layer = RegistryWindmillLayer
+    suite_name = 'AddBugTracker'
+
+    def test_adding_bugtracker_for_project(self):
+        test_inline_add_bugtracker(
+            self.client,
+            url='http://launchpad.dev:8085/bzr/+configure-bugtracker',
+            name='test_inline_add_bugtracker_for_project')
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/registry/windmill/tests/test_add_milestone.py'
--- lib/lp/registry/windmill/tests/test_add_milestone.py	2010-02-01 18:37:00 +0000
+++ lib/lp/registry/windmill/tests/test_add_milestone.py	2010-06-25 13:39:35 +0000
@@ -1,7 +1,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Test for translation import queue behaviour."""
+"""Test adding milestone in formoverlay."""
 
 __metaclass__ = type
 __all__ = []
@@ -24,9 +24,7 @@
     :param suite: The suite in which this test is part of.
     :param user: The user who should be logged in.
     """
-    # Ensure that the milestone name doesn't conflict with previous
-    # test runs, and test that it correctly lowercases the name.
-    milestone_name = u'FOObar%x' % int(time.time())
+    milestone_name = u'FOObar'
     code_name = u'code-%s' % milestone_name
 
     user.ensure_login(client)

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-06-21 19:29:34 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-06-25 13:39:35 +0000
@@ -35,6 +35,7 @@
 from zope.component import getUtility
 from zope.formlib import form
 from zope.interface import implements, Interface
+from zope.security.interfaces import Unauthorized
 from zope.security.proxy import removeSecurityProxy
 from zope.schema import Choice, List, TextLine
 from zope.schema.interfaces import IContextSourceBinder
@@ -426,7 +427,12 @@
 
     def packages(self):
         text = 'View package details'
-        return Link('+packages', text, icon='info')
+        link = Link('+packages', text, icon='info')
+        # Disable the link for P3As if they don't have upload rights.
+        if self.context.private:
+            if not check_permission('launchpad.Append', self.context):
+                link.enabled = False
+        return link
 
     @enabled_with_permission('launchpad.Edit')
     def delete(self):
@@ -500,6 +506,10 @@
     """Common features for Archive view classes."""
 
     @cachedproperty
+    def private(self):
+        return self.context.private
+
+    @cachedproperty
     def has_sources(self):
         """Whether or not this PPA has any sources for the view.
 
@@ -960,6 +970,12 @@
     """Detailed packages view for an archive."""
     implements(IArchivePackagesActionMenu)
 
+    def initialize(self):
+        super(ArchivePackagesView, self).initialize()
+        if self.context.private:
+            if not check_permission('launchpad.Append', self.context):
+                raise Unauthorized
+
     @property
     def page_title(self):
         return smartquote('Packages in "%s"' % self.context.displayname)

=== added file 'lib/lp/soyuz/browser/tests/test_archive_packages.py'
--- lib/lp/soyuz/browser/tests/test_archive_packages.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/browser/tests/test_archive_packages.py	2010-06-25 13:39:35 +0000
@@ -0,0 +1,101 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=F0401
+
+"""Unit tests for TestP3APackages."""
+
+__metaclass__ = type
+__all__ = [
+    'TestP3APackages',
+    'TestPPAPackages',
+    'test_suite',
+    ]
+
+import unittest
+
+from zope.security.interfaces import Unauthorized
+
+from canonical.testing import LaunchpadFunctionalLayer
+from lp.soyuz.browser.archive import ArchiveNavigationMenu
+from lp.testing import login, login_person, TestCaseWithFactory
+from lp.testing.views import create_initialized_view
+
+
+class TestP3APackages(TestCaseWithFactory):
+    """P3A archive pages are rendered correctly."""
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestP3APackages, self).setUp()
+        self.private_ppa = self.factory.makeArchive(description='Foo')
+        login('[e-mail]')
+        self.private_ppa.buildd_secret = 'blah'
+        self.private_ppa.private = True
+        self.joe = self.factory.makePerson(name='joe')
+        self.fred = self.factory.makePerson(name='fred')
+        self.mary = self.factory.makePerson(name='mary')
+        login_person(self.private_ppa.owner)
+        self.private_ppa.newSubscription(self.joe, self.private_ppa.owner)
+        self.private_ppa.newComponentUploader(self.mary, 'main')
+
+    def test_packages_unauthorized(self):
+        """A person with no subscription will not be able to view +packages
+        """
+        login_person(self.fred)
+        self.assertRaises(
+            Unauthorized, create_initialized_view, self.private_ppa,
+            "+packages")
+
+    def test_packages_unauthorized_subscriber(self):
+        """A person with a subscription will not be able to view +packages
+        """
+        login_person(self.joe)
+        self.assertRaises(
+            Unauthorized, create_initialized_view, self.private_ppa,
+            "+packages")
+
+    def test_packages_authorized(self):
+        """A person with launchpad.{Append,Edit} will be able to do so"""
+        login_person(self.private_ppa.owner)
+        view = create_initialized_view(self.private_ppa, "+packages")
+        menu = ArchiveNavigationMenu(view)
+        self.assertTrue(menu.packages().enabled)
+
+    def test_packages_uploader(self):
+        """A person with launchpad.Append will also be able to do so"""
+        login_person(self.mary)
+        view = create_initialized_view(self.private_ppa, "+packages")
+        menu = ArchiveNavigationMenu(view)
+        self.assertTrue(menu.packages().enabled)
+
+    def test_packages_link_unauthorized(self):
+        login_person(self.fred)
+        view = create_initialized_view(self.private_ppa, "+index")
+        menu = ArchiveNavigationMenu(view)
+        self.assertFalse(menu.packages().enabled)
+
+    def test_packages_link_subscriber(self):
+        login_person(self.joe)
+        view = create_initialized_view(self.private_ppa, "+index")
+        menu = ArchiveNavigationMenu(view)
+        self.assertFalse(menu.packages().enabled)
+
+
+class TestPPAPackages(TestCaseWithFactory):
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestPPAPackages, self).setUp()
+        self.joe = self.factory.makePerson(name='joe')
+        self.ppa = self.factory.makeArchive()
+
+    def test_ppa_packages(self):
+        login_person(self.joe)
+        view = create_initialized_view(self.ppa, "+index")
+        menu = ArchiveNavigationMenu(view)
+        self.assertTrue(menu.packages().enabled)
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/soyuz/doc/archiveauthtoken.txt'
--- lib/lp/soyuz/doc/archiveauthtoken.txt	2010-04-28 16:28:02 +0000
+++ lib/lp/soyuz/doc/archiveauthtoken.txt	2010-06-25 13:39:35 +0000
@@ -21,8 +21,7 @@
 possible if there is already a valid subscription for the user for
 that archive.
 
-First, login as joe and try to create a token for ourselves, even
-though we do not yet have a subscription:
+Create Brad, and his team:
 
     >>> login("[e-mail]")
     >>> bradsmith = factory.makePerson(
@@ -30,12 +29,6 @@
     ...     email="[e-mail]")
     >>> teambrad = factory.makeTeam(
     ...     owner=bradsmith, displayname="Team Brad", name='teambrad')
-    >>> login("[e-mail]")
-    >>> new_token = joe_private_ppa.newAuthToken(bradsmith)
-    Traceback (most recent call last):
-    ...
-    Unauthorized: You do not have a subscription for
-    PPA for Joe Smith.
 
 Create a subscription for Team Brad to joe's archive:
 

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2010-06-21 19:29:34 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2010-06-25 13:39:35 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211,E0213
@@ -629,24 +629,6 @@
         :return The new `IPackageCopyRequest`
         """
 
-    # XXX: noodles 2009-03-02 bug=336779: This should be moved into
-    # IArchiveView once the archive permissions are updated to grant
-    # IArchiveView to archive subscribers.
-    def newAuthToken(person, token=None, date_created=None):
-        """Create a new authorisation token.
-
-        XXX: noodles 2009-03-12 bug=341600 This method should not be exposed
-        through the API as we do not yet check that the callsite has
-        launchpad.Edit on the person.
-
-        :param person: An IPerson whom this token is for
-        :param token: Optional unicode text to use as the token. One will be
-            generated if not given
-        :param date_created: Optional, defaults to now
-
-        :return: A new IArchiveAuthToken
-        """
-
     @operation_parameters(
         person=Reference(schema=IPerson),
         # Really IPackageset, corrected in _schema_circular_imports to avoid
@@ -1112,6 +1094,33 @@
         :return: A dictionary of filenames and SHA1s.
         """
 
+    def getAuthToken(person):
+        """Returns an IArchiveAuthToken for the archive in question for
+        IPerson provided.
+
+        :return: A IArchiveAuthToken, or None if the user has none.
+        """
+
+    def newAuthToken(person, token=None, date_created=None):
+        """Create a new authorisation token.
+
+        :param person: An IPerson whom this token is for
+        :param token: Optional unicode text to use as the token. One will be
+            generated if not given
+        :param date_created: Optional, defaults to now
+
+        :return: A new IArchiveAuthToken
+        """
+
+    @call_with(person=REQUEST_USER)
+    @export_write_operation()
+    def getPrivateSourcesList(person):
+        """Get a text line that is suitable to be used for a sources.list
+        entry.
+
+        It will create a new IArchiveAuthToken if one doesn't already exist.
+        """
+
 class IArchiveAppend(Interface):
     """Archive interface for operations restricted by append privilege."""
 

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-06-21 19:29:34 +0000
+++ lib/lp/soyuz/model/archive.py	2010-06-25 13:39:35 +0000
@@ -1392,30 +1392,26 @@
         # Perform the copy, may raise CannotCopy.
         do_copy(sources, self, series, pocket, include_binaries)
 
+    def getAuthToken(self, person):
+        """See `IArchive`."""
+
+        token_set = getUtility(IArchiveAuthTokenSet)
+        return token_set.getActiveTokenForArchiveAndPerson(self, person)
+
     def newAuthToken(self, person, token=None, date_created=None):
         """See `IArchive`."""
 
+        # Bail if the archive isn't private
+        if not self.private:
+            raise ArchiveNotPrivate("Archive must be private.")
+
         # Tokens can only be created for individuals.
         if person.is_team:
             raise NoTokensForTeams(
                 "Subscription tokens can be created for individuals only.")
 
-        # First, ensure that a current subscription exists for the
-        # person and archive:
-        # XXX: noodles 2009-03-02 bug=336779: This can be removed once
-        # newAuthToken() is moved into IArchiveView.
-        subscription_set = getUtility(IArchiveSubscriberSet)
-        subscriptions = subscription_set.getBySubscriber(person, archive=self)
-        if subscriptions.count() == 0:
-            raise Unauthorized(
-                "You do not have a subscription for %s." % self.displayname)
-
-        # Second, ensure that the current subscription does not already
-        # have a token:
-        token_set = getUtility(IArchiveAuthTokenSet)
-        previous_token = token_set.getActiveTokenForArchiveAndPerson(
-            self, person)
-        if previous_token:
+        # Ensure that the current subscription does not already have a token
+        if self.getAuthToken(person) is not None:
             raise ArchiveSubscriptionError(
                 "%s already has a token for %s." % (
                     person.displayname, self.displayname))
@@ -1433,6 +1429,14 @@
         store.add(archive_auth_token)
         return archive_auth_token
 
+    def getPrivateSourcesList(self, person):
+        """See `IArchive`."""
+
+        token = self.getAuthToken(person)
+        if token is None:
+            token = self.newAuthToken(person)
+        return token.archive_url
+
     def newSubscription(self, subscriber, registrant, date_expires=None,
                         description=None):
         """See `IArchive`."""

=== modified file 'lib/lp/soyuz/stories/webservice/xx-archive.txt'
--- lib/lp/soyuz/stories/webservice/xx-archive.txt	2010-06-14 14:16:13 +0000
+++ lib/lp/soyuz/stories/webservice/xx-archive.txt	2010-06-25 13:39:35 +0000
@@ -890,6 +890,16 @@
     >>> print response.getHeader('Location')
     http://.../~cprov/+archive/p3a/+subscriptions/mark
 
+We can print the sources.list entry for the archive, which will include an
+AuthToken:
+
+    >>> sources_response = webservice.named_post(
+    ...     cprov_private_ppa['self_link'], 'getPrivateSourcesList')
+    >>> print sources_response
+    HTTP/1.1 200 Ok
+    ...
+    "http://salgado:[e-mail]/cprov/p3a/ubuntu"
+
 We publish a subset of the IArchiveSubscriber attributes.
 
     >>> new_subscription = cprov_webservice.get(

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-06-16 18:47:46 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-06-25 13:39:35 +0000
@@ -790,6 +790,30 @@
                 self.archive, self.arm).count())
         self.assertFalse(self.archive.arm_builds_allowed)
 
+class TestArchiveTokens(TestCaseWithFactory):
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        super(TestArchiveTokens, self).setUp()
+        owner = self.factory.makePerson()
+        self.private_ppa = self.factory.makeArchive(owner=owner)
+        self.private_ppa.buildd_secret = 'blah'
+        self.private_ppa.private = True
+        self.joe = self.factory.makePerson(name='joe')
+        self.private_ppa.newSubscription(self.joe, owner)
+
+    def test_getAuthToken_with_no_token(self):
+        token = self.private_ppa.getAuthToken(self.joe)
+        self.assertEqual(token, None)
+
+    def test_getAuthToken_with_token(self):
+        token = self.private_ppa.newAuthToken(self.joe)
+        self.assertEqual(self.private_ppa.getAuthToken(self.joe), token)
+
+    def test_getPrivateSourcesList(self):
+        url = self.private_ppa.getPrivateSourcesList(self.joe)
+        token = self.private_ppa.getAuthToken(self.joe)
+        self.assertEqual(token.archive_url, url)
 
 class TestArchivePrivacySwitching(TestCaseWithFactory):
 

=== added file 'lib/lp/soyuz/tests/test_archive_privacy.py'
--- lib/lp/soyuz/tests/test_archive_privacy.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/tests/test_archive_privacy.py	2010-06-25 13:39:35 +0000
@@ -0,0 +1,40 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test Archive privacy features."""
+
+from zope.component import getUtility
+from zope.security.interfaces import Unauthorized
+from lp.soyuz.interfaces.archive import IArchiveSet
+
+from canonical.testing import LaunchpadFunctionalLayer
+from lp.testing import login, login_person, TestCaseWithFactory
+
+
+class TestArchivePrivacy(TestCaseWithFactory):
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestArchivePrivacy, self).setUp()
+        self.private_ppa = self.factory.makeArchive(description='Foo')
+        login('[e-mail]')
+        self.private_ppa.buildd_secret = 'blah'
+        self.private_ppa.private = True
+        self.joe = self.factory.makePerson(name='joe')
+        self.fred = self.factory.makePerson(name='fred')
+        login_person(self.private_ppa.owner)
+        self.private_ppa.newSubscription(self.joe, self.private_ppa.owner)
+
+    def _getDescription(self, p3a):
+        return p3a.description
+
+    def test_no_subscription(self):
+        login_person(self.fred)
+        p3a = getUtility(IArchiveSet).get(self.private_ppa.id)
+        self.assertRaises(Unauthorized, self._getDescription, p3a)
+
+    def test_subscription(self):
+        login_person(self.joe)
+        p3a = getUtility(IArchiveSet).get(self.private_ppa.id)
+        self.assertEqual(self._getDescription(p3a), "Foo")
+

=== modified file 'utilities/lp-deps.py'
--- utilities/lp-deps.py	2010-06-14 22:18:14 +0000
+++ utilities/lp-deps.py	2010-06-25 13:39:35 +0000
@@ -20,6 +20,7 @@
 # JS_DIRSET is a tuple of the dir where the code exists, and the name of the
 # symlink it should be linked as in the icing build directory.
 JS_DIRSET = [
+    (os.path.join('lib', 'lp', 'bugs', 'javascript'), 'bugs'),
     (os.path.join('lib', 'lp', 'code', 'javascript'), 'code'),
     (os.path.join('lib', 'lp', 'registry', 'javascript'), 'registry'),
     (os.path.join('lib', 'lp', 'translations', 'javascript'), 'translations'),

=== modified file 'utilities/qa-ready'
--- utilities/qa-ready	2010-04-27 19:48:39 +0000
+++ utilities/qa-ready	2010-06-25 13:39:35 +0000
@@ -35,7 +35,7 @@
     """
     t = get_transport('https://edge.launchpad.net/')
     html = t.get_bytes('index.html')
-    revision_re = re.compile(r'\(r(\d+)\)')
+    revision_re = re.compile(r'r(\d+)')
     for line in html.splitlines():
         matches = revision_re.search(line)
         if matches: