Merge lp:~gmb/launchpad/subscriber-portlet-timeout-bug-393476 into lp:launchpad

[Graham Binns]

[Graham Binns (gmb)]

This branch fixes bug 393476 (subscribers portlet times out) by loading
the subscribers from duplicates separately from the main set of
subscribers.

Most bugs have a relatively low number of direct subscribers, but a bug
with a large number of duplicates can have thousands of indirect ones.
Loading these indirect subscribers can sometimes time out because of the
large number of subscribers and because in order to display them we need
to iterate over the result set before rendering the page.

My solution is to load the subscribers from duplicates separately.
Whilst we could spend time optimising the query and the iterations over
the result set, there will come a point where, for bugs with large
numbers of indirect subscribers, there will simply be too many to
handle. In those cases it's important that we still render the list of
direct subscribers (because that's usually the most interesting list of
subscribers on a bug page) and, most importantly, that we set up the
subscribe and unsubscribe links properly (at the moment the timeout
causes the AJAX controls to never get set up).

== Changes ==

=== lib/canonical/launchpad/javascript/bugs/bugtask-index.js ===

 - I've added two functions here. load_subscribers_from_duplicates()
   does the asynchronous loading of subs from dupes and
   Y.bugs.load_subscribers_portlet() contains the subs portlet setup
   code that was previously inline in the portlet template.
 - load_subscribers_from_duplicates() is now called once the
   portletloaded event is fired, meaning that it only happens once the
   direct subscribers have been loaded and the links have been set up
   correctly.

=== lib/lp/bugs/browser/bugsubscription.py ===

 - I've refactored the existing BugPortletSubcribersContents view into
   two views: BugPortletSubcribersContents and
   BugPortletDuplicateSubcribersContents. The second deals with the
   subs from dupes list.
 - I've updated the methods used in these views to turn them into
   @properties, per the coding standards.

=== lib/lp/bugs/browser/configure.zcml ===

 - I've added an entry for the BugPortletDuplicateSubcribersContents
   view.

=== lib/lp/bugs/templates/bug-portlet-dupe-subscribers-content.pt ===

 - I've added this template that displays only the list of subscribers
   from duplicates.

=== lib/lp/bugs/templates/bug-portlet-subscribers-content.pt ===

 - I've updated the existing template to remove the subs from dupes
   code.

=== lib/lp/bugs/templates/bug-portlet-subscribers.pt ===

 - I've removed the inline JS that didn't need to be inline, fixing bug
   369874 as a drive-by.

== Launchpad lint ==

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/javascript/bugs/bugtask-index.js
  lib/lp/bugs/browser/bugsubscription.py
  lib/lp/bugs/browser/configure.zcml
  lib/lp/bugs/templates/bug-portlet-dupe-subscribers-content.pt
  lib/lp/bugs/templates/bug-portlet-subscribers-content.pt
  lib/lp/bugs/templates/bug-portlet-subscribers.pt

== JSLint notices ==
jslint: No problem found in '/home/graham/canonical/lp-branches/subscriber-portlet-t...

[Abel Deuring (adeuring)]

looks good

review: Approve (code)

=== modified file 'lib/canonical/launchpad/javascript/bugs/bugtask-index.js'
--- lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-11-03 14:41:35 +0000
+++ lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-11-08 11:19:16 +0000
@@ -46,15 +46,13 @@
  * depends on that portlet being loaded, setup a custom
  * event object, to provide a hook for initializing subscription
  * link callbacks after a bugs:portletloaded event.
- *
- * XXX deryck 2009-04-30 bug=369874 Now this object exists,
- * the inline js on bug-portlet-subscribers.pt should be moved here.
-*/
+ */
 var PortletTarget = function() {};
 Y.augment(PortletTarget, Y.Event.Target);
 Y.bugs.portlet = new PortletTarget();
 Y.bugs.portlet.subscribe('bugs:portletloaded', function() {
     setup_subscription_link_handlers();
+    load_subscribers_from_duplicates();
 });
 /*
  * If the subscribers portlet fails to load, clear any
@@ -1719,6 +1717,75 @@
     });
 }
 
+function load_subscribers_from_duplicates() {
+    if (Y.UA.ie) {
+        return null;
+    }
+
+    Y.get('#subscribers-portlet-dupe-spinner').setStyle(
+        'display', 'block');
+
+    function hide_spinner() {
+        Y.get('#subscribers-portlet-dupe-spinner').setStyle(
+            'display', 'none');
+    }
+
+    function on_success(transactionid, response, args) {
+        hide_spinner();
+
+        var dupe_subscribers_container = Y.get(
+            '#subscribers-from-duplicates-container');
+        dupe_subscribers_container.set(
+            'innerHTML',
+            dupe_subscribers_container.get('innerHTML') +
+            response.responseText);
+    }
+
+    var config = {on: {success: on_success,
+                       failure: hide_spinner}};
+    var url = Y.get(
+        '#subscribers-from-dupes-content-link').getAttribute(
+            'href').replace('bugs.', '');
+    Y.io(url, config);
+}
+
+Y.bugs.load_subscribers_portlet = function(
+        subscription_link, subscription_link_handler) {
+    if (Y.UA.ie) {
+        return null;
+    }
+
+    Y.get('#subscribers-portlet-spinner').setStyle('display', 'block');
+
+    function hide_spinner() {
+        Y.get('#subscribers-portlet-spinner').setStyle('display', 'none');
+            // Fire a custom event to notify that the initial click
+            // handler on subscription_link set above should be
+            // cleared.
+            if (Y.bugs) {
+                Y.bugs.portlet.fire(
+                  'bugs:portletloadfailed', subscription_link_handler);
+        }
+    }
+
+    function on_success(transactionid, response, args) {
+        hide_spinner();
+        var portlet = Y.get('#portlet-subscribers');
+        portlet.set('innerHTML',
+                    portlet.get('innerHTML') + response.responseText);
+
+        // Fire a custom portlet loaded event to notify when
+        // it's safe to setup subscriber link callbacks.
+        Y.bugs.portlet.fire('bugs:portletloaded');
+    }
+
+    var config = {on: {success: on_success,
+                       failure: hide_spinner}};
+    var url = Y.get(
+        '#subscribers-content-link').getAttribute('href').replace('bugs.', '');
+    Y.io(url, config);
+};
+
 }, '0.1', {requires: ['base', 'oop', 'node', 'event', 'io-base', 'substitute',
                       'widget-position-ext', 'lazr.formoverlay', 'lazr.anim',
                       'lazr.base', 'lazr.overlay', 'lazr.choiceedit',

=== modified file 'lib/lp/bugs/browser/bugsubscription.py'
--- lib/lp/bugs/browser/bugsubscription.py	2009-08-31 15:41:15 +0000
+++ lib/lp/bugs/browser/bugsubscription.py	2009-11-08 11:19:16 +0000
@@ -5,6 +5,7 @@
 
 __metaclass__ = type
 __all__ = [
+    'BugPortletDuplicateSubcribersContents',
     'BugPortletSubcribersContents',
     'BugSubscriptionAddView',
     ]
@@ -61,7 +62,8 @@
 class BugPortletSubcribersContents(LaunchpadView, BugViewMixin):
     """View for the contents for the subscribers portlet."""
 
-    def getSortedDirectSubscriptions(self):
+    @property
+    def sorted_direct_subscriptions(self):
         """Get the list of direct subscriptions to the bug.
 
         The list is sorted such that subscriptions you can unsubscribe appear
@@ -83,7 +85,12 @@
                 cannot_unsubscribe.append(subscription)
         return can_unsubscribe + cannot_unsubscribe
 
-    def getSortedSubscriptionsFromDuplicates(self):
+
+class BugPortletDuplicateSubcribersContents(LaunchpadView, BugViewMixin):
+    """View for the contents for the subscribers-from-dupes portlet block."""
+
+    @property
+    def sorted_subscriptions_from_dupes(self):
         """Get the list of subscriptions to duplicates of this bug."""
         return [
             SubscriptionAttrDecorator(subscription)

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2009-10-30 12:09:16 +0000
+++ lib/lp/bugs/browser/configure.zcml	2009-11-08 11:19:16 +0000
@@ -998,6 +998,12 @@
             class="lp.bugs.browser.bugsubscription.BugPortletSubcribersContents"
             template="../templates/bug-portlet-subscribers-content.pt"
             permission="zope.Public"/>
+        <browser:page
+            for="lp.bugs.interfaces.bug.IBug"
+            name="+bug-portlet-dupe-subscribers-content"
+            class="lp.bugs.browser.bugsubscription.BugPortletDuplicateSubcribersContents"
+            template="../templates/bug-portlet-dupe-subscribers-content.pt"
+            permission="zope.Public"/>
         <browser:navigation
             module="lp.bugs.browser.bug"
             classes="

=== modified file 'lib/lp/bugs/browser/tests/bug-portlet-subscribers-content.txt'
--- lib/lp/bugs/browser/tests/bug-portlet-subscribers-content.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/browser/tests/bug-portlet-subscribers-content.txt	2009-11-08 11:19:16 +0000
@@ -15,7 +15,7 @@
     <BugSubscription at ...>
     >>> bug.subscribe(view.user.teams_participated_in[0], view.user)
     <BugSubscription at ...>
-    >>> for subscription in view.getSortedDirectSubscriptions():
+    >>> for subscription in view.sorted_direct_subscriptions:
     ...     print '%s   %s' % (
     ...         subscription.person.displayname,
     ...         subscription.canBeUnsubscribedByUser(view.user))

=== modified file 'lib/lp/bugs/stories/bug-privacy/05-set-bug-private-as-admin.txt'
--- lib/lp/bugs/stories/bug-privacy/05-set-bug-private-as-admin.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bug-privacy/05-set-bug-private-as-admin.txt	2009-11-08 11:19:16 +0000
@@ -9,7 +9,8 @@
 explicit. There are two implicit subscribers.
 
     >>> from lp.bugs.tests.bug import (
-    ...     print_direct_subscribers, print_indirect_subscribers)
+    ...     print_also_notified, print_direct_subscribers,
+    ...     print_subscribers_from_duplicates)
 
     >>> browser.open(
     ...     "http://launchpad.dev/bugs/2/+bug-portlet-subscribers-content")
@@ -17,8 +18,9 @@
     >>> print_direct_subscribers(browser.contents)
     Steve Alexander (Subscribed by Launchpad Janitor)
 
-    >>> print_indirect_subscribers(browser.contents)
+    >>> print_subscribers_from_duplicates(browser.contents)
     From duplicates:
+    >>> print_also_notified(browser.contents)
     Also notified:
     Mark Shuttleworth
     Sample Person
@@ -46,8 +48,9 @@
   Sample Person (Subscribed by Foo Bar)
   Steve Alexander (Subscribed by Launchpad Janitor)
 
-  >>> print_indirect_subscribers(browser.contents)
+  >>> print_subscribers_from_duplicates(browser.contents)
   From duplicates:
+  >>> print_also_notified(browser.contents)
   Also notified:
 
 When we go back to the secrecy form, the previously set value is pre-selected.

=== modified file 'lib/lp/bugs/stories/bugs/bug-add-subscriber.txt'
--- lib/lp/bugs/stories/bugs/bug-add-subscriber.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/bugs/stories/bugs/bug-add-subscriber.txt	2009-11-08 11:19:16 +0000
@@ -32,7 +32,8 @@
 currently subscribed to the bug:
 
     >>> from lp.bugs.tests.bug import (
-    ...     print_direct_subscribers, print_indirect_subscribers)
+    ...     print_also_notified, print_direct_subscribers,
+    ...     print_subscribers_from_duplicates)
 
     >>> user_browser.open(
     ...     'http://bugs.launchpad.dev/bugs/1/'
@@ -40,8 +41,9 @@
     >>> print_direct_subscribers(user_browser.contents)
     Sample Person (Subscribed by Launchpad Janitor)
     Steve Alexander (Subscribed by Launchpad Janitor)
-    >>> print_indirect_subscribers(user_browser.contents)
+    >>> print_subscribers_from_duplicates(user_browser.contents)
     From duplicates:
+    >>> print_also_notified(user_browser.contents)
     Also notified:
     Foo Bar
     Mark Shuttleworth

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions.txt	2009-09-19 10:04:20 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions.txt	2009-11-08 11:19:16 +0000
@@ -4,7 +4,8 @@
 in the actions portlet.
 
   >>> from lp.bugs.tests.bug import (
-  ...     print_direct_subscribers, print_indirect_subscribers)
+  ...     print_direct_subscribers, print_also_notified,
+  ...     print_subscribers_from_duplicates)
 
   >>> browser = setupBrowser(auth='Basic [e-mail]:test')
   >>> browser.open('http://bugs.launchpad.dev/firefox/+bug/1')
@@ -183,9 +184,13 @@
     >>> stevea_browser = setupBrowser(
     ...   auth="Basic [e-mail]:test")
     >>> stevea_browser.open(
+    ...     "http://launchpad.dev/bugs/3/+bug-portlet-dupe-subscribers-content")
+    >>> print_subscribers_from_duplicates(stevea_browser.contents)
+    From duplicates:
+
+    >>> stevea_browser.open(
     ...     "http://launchpad.dev/bugs/3/+bug-portlet-subscribers-content")
-    >>> print_indirect_subscribers(stevea_browser.contents)
-    From duplicates:
+    >>> print_also_notified(stevea_browser.contents)
     Also notified:
     Mark Shuttleworth
 
@@ -200,14 +205,11 @@
   >>> stevea_browser.getControl("Change").click()
 
   >>> stevea_browser.open(
-  ...     "http://launchpad.dev/bugs/3/+bug-portlet-subscribers-content")
-
-  >>> print_indirect_subscribers(stevea_browser.contents)
+  ...     "http://launchpad.dev/bugs/3/+bug-portlet-dupe-subscribers-content")
+  >>> print_subscribers_from_duplicates(stevea_browser.contents)
   From duplicates:
   Steve Alexander (Subscribed by Launchpad Janitor)
                   (Unsubscribe Steve Alexander)
-  Also notified:
-  Mark Shuttleworth
 
   >>> stevea_browser.getLink(id='unsubscribe-subscriber-11').mech_link.url
   '+subscribe'
@@ -233,9 +235,13 @@
 to bug #3.)
 
   >>> stevea_browser.open(
+  ...     "http://launchpad.dev/bugs/3/+bug-portlet-dupe-subscribers-content")
+  >>> print_subscribers_from_duplicates(stevea_browser.contents)
+  From duplicates:
+
+  >>> stevea_browser.open(
   ...     "http://launchpad.dev/bugs/3/+bug-portlet-subscribers-content")
-  >>> print_indirect_subscribers(stevea_browser.contents)
-  From duplicates:
+  >>> print_also_notified(stevea_browser.contents)
   Also notified:
   Mark Shuttleworth
 
@@ -256,12 +262,16 @@
   >>> stevea_browser.getControl("Continue").click()
 
   >>> stevea_browser.open(
-  ...     "http://launchpad.dev/bugs/3/+bug-portlet-subscribers-content")
-  >>> print_indirect_subscribers(stevea_browser.contents)
+  ...     "http://launchpad.dev/bugs/3/+bug-portlet-dupe-subscribers-content")
+  >>> print_subscribers_from_duplicates(stevea_browser.contents)
   From duplicates:
   Sample Person (Subscribed ...)
   Steve Alexander (Subscribed ...) (Unsubscribe Steve Alexander)
   testing Spanish team (Subscribed by Foo Bar)
+
+  >>> stevea_browser.open(
+  ...     "http://launchpad.dev/bugs/3/+bug-portlet-subscribers-content")
+  >>> print_also_notified(stevea_browser.contents)
   Also notified:
   Mark Shuttleworth
 
@@ -295,11 +305,16 @@
   >>> foobar_browser.getControl("Subscribe user").click()
 
   >>> foobar_browser.open(
-  ...     "http://launchpad.dev/bugs/3/+bug-portlet-subscribers-content")
+  ...     "http://launchpad.dev/bugs/3/+bug-portlet-dupe-subscribers-content")
 
-  >>> print_indirect_subscribers(foobar_browser.contents)
+  >>> print_subscribers_from_duplicates(foobar_browser.contents)
   From duplicates:
   Ubuntu Team (Subscribed by Foo Bar) (Unsubscribe Ubuntu Team)
+
+  >>> foobar_browser.open(
+  ...     "http://launchpad.dev/bugs/3/+bug-portlet-subscribers-content")
+
+  >>> print_also_notified(foobar_browser.contents)
   Also notified:
   Mark Shuttleworth
 
@@ -326,9 +341,13 @@
 (ubuntu-team is no longer an indirect subscriber.)
 
   >>> foobar_browser.open(
+  ...     "http://launchpad.dev/bugs/3/+bug-portlet-dupe-subscribers-content")
+  >>> print_subscribers_from_duplicates(foobar_browser.contents)
+  From duplicates:
+
+  >>> foobar_browser.open(
   ...     "http://launchpad.dev/bugs/3/+bug-portlet-subscribers-content")
-  >>> print_indirect_subscribers(foobar_browser.contents)
-  From duplicates:
+  >>> print_also_notified(foobar_browser.contents)
   Also notified:
   Mark Shuttleworth
 

=== added file 'lib/lp/bugs/templates/bug-portlet-dupe-subscribers-content.pt'
--- lib/lp/bugs/templates/bug-portlet-dupe-subscribers-content.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/templates/bug-portlet-dupe-subscribers-content.pt	2009-11-08 11:19:16 +0000
@@ -0,0 +1,27 @@
+<div
+  tal:omit-tag=""
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  tal:define="
+    bug context/bug|context;
+    from_dupes_subscriptions view/sorted_subscriptions_from_dupes;
+  ">
+  <div
+    tal:condition="from_dupes_subscriptions"
+    id="subscribers-from-duplicates"
+    class="section"
+  >
+    <h2>From duplicates</h2>
+    <div
+      tal:repeat="subscription from_dupes_subscriptions"
+      tal:attributes="
+        class subscription/css_name;
+        id string:dupe-${subscription/css_name};
+      "
+    >
+      <metal:subscriber
+          metal:use-macro="bug/@@+bug-portlet-subscribers-content/subscriber-row" />
+    </div>
+  </div>
+</div>

=== modified file 'lib/lp/bugs/templates/bug-portlet-subscribers-content.pt'
--- lib/lp/bugs/templates/bug-portlet-subscribers-content.pt	2009-08-03 12:53:22 +0000
+++ lib/lp/bugs/templates/bug-portlet-subscribers-content.pt	2009-11-08 11:19:16 +0000
@@ -5,8 +5,7 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   tal:define="
     bug context/bug|context;
-    direct_subscriptions view/getSortedDirectSubscriptions;
-    from_dupes_subscriptions view/getSortedSubscriptionsFromDuplicates;
+    direct_subscriptions view/sorted_direct_subscriptions;
     also_notified_subscribers bug/getAlsoNotifiedSubscribers
   ">
   <div class="section" id="subscribers-direct">
@@ -17,7 +16,7 @@
         tal:repeat="subscription direct_subscriptions"
         tal:attributes="class subscription/css_name"
       >
-        <metal:subscriber  metal:define-macro="subscriber-row">
+        <metal:subscriber metal:define-macro="subscriber-row">
 
             <a
                tal:condition="subscription/person/name|nothing"
@@ -49,20 +48,12 @@
       <div id="none-subscribers"
         tal:condition="not:direct_subscriptions">None</div>
   </div>
-  <div
-    tal:condition="from_dupes_subscriptions"
-    id="subscribers-from-duplicates"
-    class="section"
-  >
-    <h2>From duplicates</h2>
-    <div
-      tal:repeat="subscription from_dupes_subscriptions"
-      tal:attributes="
-        class subscription/css_name;
-        id string:dupe-${subscription/css_name};
-      "
-    >
-      <metal:subscriber metal:use-macro="template/macros/subscriber-row" />
+  <div id="subscribers-from-duplicates-container">
+    <a id="subscribers-from-dupes-content-link"
+       tal:attributes="href bug/fmt:url/+bug-portlet-dupe-subscribers-content"></a>
+    <div id="subscribers-portlet-dupe-spinner"
+         style="text-align: center; display: none">
+      <img src="/@@/spinner" />
     </div>
   </div>
   <div

=== modified file 'lib/lp/bugs/templates/bug-portlet-subscribers.pt'
--- lib/lp/bugs/templates/bug-portlet-subscribers.pt	2009-10-29 21:39:12 +0000
+++ lib/lp/bugs/templates/bug-portlet-subscribers.pt	2009-11-08 11:19:16 +0000
@@ -23,52 +23,22 @@
   </div>
   <script type="text/javascript">
     YUI().use('io-base', 'node', 'bugs.bugtask_index', function(Y) {
-      // Must be done inline here to ensure the load event fires.
-      // This is a work around for a YUI3 issue with event handling.
-      var subscription_link = Y.get('.menu-link-subscription');
-      var subscription_link_handler;
-      if (subscription_link) {
-          subscription_link_handler = subscription_link.on('click', function(e) {
-              e.preventDefault();
-          });
-      }
-      Y.on('domready', function() {
-        if (Y.UA.ie) {
-            return null;
-        }
-
-        Y.get('#subscribers-portlet-spinner').setStyle('display', 'block');
-
-        function hide_spinner() {
-          Y.get('#subscribers-portlet-spinner').setStyle('display', 'none');
-          // Fire a custom event to notify that the initial click handler
-          // on subscription_link set above should be cleared.
-          if (Y.bugs) {
-              Y.bugs.portlet.fire(
-                'bugs:portletloadfailed', subscription_link_handler);
-          }
-        }
-
-        function on_success(transactionid, response, arguments) {
-          hide_spinner();
-          var portlet = Y.get('#portlet-subscribers');
-          portlet.set('innerHTML',
-                      portlet.get('innerHTML') + response.responseText);
-          // Fire a custom portlet loaded event to notify when
-          // it's safe to setup subscriber link callbacks.
-          // XXX deryck 2009-04-30 bug=369874 Now this object exists,
-          // the inline js here should be moved to bugtask-index.js.
-          // Moving will also prevent having the paranoia check for Y.bugs.
-          if (Y.bugs) {
-              Y.bugs.portlet.fire('bugs:portletloaded');
-          }
-        }
-
-        var config = {on: {success: on_success,
-                           failure: hide_spinner}};
-        var url = Y.get('#subscribers-content-link').getAttribute('href').replace('bugs.', '');
-        Y.io(url, config);
-      });
+        // Must be done inline here to ensure the load event fires.
+        // This is a work around for a YUI3 issue with event handling.
+        var subscription_link = Y.get('.menu-link-subscription');
+        var subscription_link_handler;
+        if (subscription_link) {
+            subscription_link_handler = subscription_link.on('click', function(e) {
+                e.preventDefault();
+            });
+        }
+
+        Y.on('domready', function() {
+            if (Y.bugs) {
+                Y.bugs.load_subscribers_portlet(
+                    subscription_link, subscription_link_handler);
+            }
+        });
     });
   </script>
 </div>

=== modified file 'lib/lp/bugs/tests/bug.py'
--- lib/lp/bugs/tests/bug.py	2009-08-18 11:04:38 +0000
+++ lib/lp/bugs/tests/bug.py	2009-11-08 11:19:16 +0000
@@ -33,12 +33,16 @@
     print_subscribers(bug_page, 'subscribers-direct')
 
 
-def print_indirect_subscribers(bug_page):
-    """Print the indirect subscribers listed in a portlet."""
+def print_also_notified(bug_page):
+    """Print the structural subscribers listed in a portlet."""
+    print 'Also notified:'
+    print_subscribers(bug_page, 'subscribers-indirect')
+
+
+def print_subscribers_from_duplicates(bug_page):
+    """Print the subscribers from duplicates listed in a portlet."""
     print 'From duplicates:'
     print_subscribers(bug_page, 'subscribers-from-duplicates')
-    print 'Also notified:'
-    print_subscribers(bug_page, 'subscribers-indirect')
 
 
 def print_subscribers(bug_page, subscriber_list_id):