Merge lp:~wallyworld/launchpad/milestone-ajax-batch-nav into lp:launchpad

[Ian Booth]

[lp:~wallyworld/launchpad/milestone-ajax-batch-nav]

14114. By Ian Booth on 2011-10-12

Revert rename

Unmerged revisions

14114. By Ian Booth on 2011-10-12

Revert rename

14113. By Ian Booth on 2011-10-12

Add ajax batch nav to milestones

=== modified file 'lib/lp/app/browser/tests/test_macro_view.py'
--- lib/lp/app/browser/tests/test_macro_view.py	2011-09-01 14:36:10 +0000
+++ lib/lp/app/browser/tests/test_macro_view.py	2011-10-12 02:44:27 +0000
@@ -41,7 +41,6 @@
         '+bmq-macros',
         '+announcement-macros',
         '+person-macros',
-        '+milestone-macros',
         '+distributionmirror-macros',
         '+timeline-macros',
         '+macros',

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2011-10-12 02:44:27 +0000
+++ lib/lp/bugs/browser/bugtask.py	2011-10-12 02:44:27 +0000
@@ -2464,7 +2464,7 @@
                 "columns to show.")
 
     bugtask_table_template = ViewPageTemplateFile(
-        '../templates/bugs-table-include.pt')
+        '../templates/bugs-listing-table-include.pt')
 
     @property
     def template(self):

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2011-10-04 08:46:11 +0000
+++ lib/lp/registry/browser/configure.zcml	2011-10-12 02:44:27 +0000
@@ -1338,11 +1338,15 @@
         rootsite="mainsite"
         attribute_to_parent="target"/>
     <browser:page
-        for="*"
-        name="+milestone-macros"
-        permission="zope.Public"
-        template="../templates/milestone-macros.pt"
-        class="lp.app.browser.launchpad.Macro"/>
+        for="lp.registry.interfaces.milestone.IMilestoneBugtaskListingBatchNavigator"
+        name="+listing"
+        template="../templates/milestone-bugtask-listing.pt"
+        permission="zope.Public"/>
+    <browser:page
+        for="lp.registry.interfaces.milestone.IMilestoneSpecificationListingBatchNavigator"
+        name="+listing"
+        template="../templates/milestone-specification-listing.pt"
+        permission="zope.Public"/>
     <browser:pages
         for="lp.registry.interfaces.milestone.IMilestone"
         class="lp.registry.browser.milestone.MilestoneView"

=== modified file 'lib/lp/registry/browser/milestone.py'
--- lib/lp/registry/browser/milestone.py	2011-04-18 14:57:42 +0000
+++ lib/lp/registry/browser/milestone.py	2011-10-12 02:44:27 +0000
@@ -21,6 +21,8 @@
     ]
 
 
+import urlparse
+from z3c.ptcompat import ViewPageTemplateFile
 from zope.component import getUtility
 from zope.formlib import form
 from zope.interface import (
@@ -40,6 +42,7 @@
 from canonical.launchpad.webapp.authorization import (
     precache_permission_for_objects,
     )
+from canonical.launchpad.webapp.batching import TableBatchNavigator
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.menu import (
     ApplicationMenu,
@@ -72,6 +75,8 @@
     IMilestone,
     IMilestoneSet,
     IProjectGroupMilestone,
+    IMilestoneBugtaskListingBatchNavigator,
+    IMilestoneSpecificationListingBatchNavigator,
     )
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.product import IProduct
@@ -183,6 +188,49 @@
     links = ('edit', )
 
 
+class MilestoneBugTaskListingBatchNavigator(TableBatchNavigator):
+    """Batch up the milestone bugtask listings."""
+    implements(IMilestoneBugtaskListingBatchNavigator)
+
+    def __init__(self, view):
+        TableBatchNavigator.__init__(
+            self, view._bugtasks, view.request)
+        self.view = view
+
+    @cachedproperty
+    def bugtasks(self):
+        return [self.view._getListingItem(bugtask)
+                    for bugtask in self.currentBatch()]
+
+    @property
+    def table_class(self):
+        if self.has_multiple_pages:
+            return "listing"
+        else:
+            return "listing sortable"
+
+
+class MilestoneSpecificationListingBatchNavigator(TableBatchNavigator):
+    """Batch up the milestone specification listings."""
+    implements(IMilestoneSpecificationListingBatchNavigator)
+
+    def __init__(self, view):
+        TableBatchNavigator.__init__(
+            self, view._specifications, view.request)
+        self.view = view
+
+    @cachedproperty
+    def specifications(self):
+        return self.currentBatch()
+
+    @property
+    def table_class(self):
+        if self.has_multiple_pages:
+            return "listing"
+        else:
+            return "listing sortable"
+
+
 class MilestoneView(LaunchpadView, ProductDownloadFileMixin):
     """A View for listing milestones and releases."""
     # XXX sinzui 2009-05-29 bug=381672: Extract the BugTaskListingItem rules
@@ -216,6 +264,23 @@
         expose_structural_subscription_data_to_js(
             self.context, self.request, self.user)
 
+    bugtask_table_template = ViewPageTemplateFile(
+        '../templates/milestone-bugtasks-table.pt')
+    specification_table_template = ViewPageTemplateFile(
+        '../templates/milestone-specifications-table.pt')
+
+    @property
+    def template(self):
+        query_string = self.request.get('QUERY_STRING', '')
+        query_params = urlparse.parse_qs(query_string)
+        batch_request_param = query_params.get('batch_request', None)
+        if batch_request_param is None:
+            return super(MilestoneView, self).template
+        elif 'bugtask_batch' in batch_request_param:
+            return self.bugtask_table_template
+        else:
+            return self.specification_table_template
+
     @property
     def expire_cache_minutes(self):
         """Active milestone caches expires sooner than non-active ones."""
@@ -249,11 +314,16 @@
     # to avoid making the same query over and over again when evaluating in
     # the template.
     @cachedproperty
-    def specifications(self):
+    def _specifications(self):
         """The list of specifications targeted to this milestone."""
         return list(self.context.specifications)
 
     @cachedproperty
+    def specifications(self):
+        """The list of specifications targeted to this milestone."""
+        return MilestoneSpecificationListingBatchNavigator(self)
+
+    @cachedproperty
     def product_release_files(self):
         """Files associated with this milestone."""
         return list(self.release.files)
@@ -300,12 +370,12 @@
     @cachedproperty
     def bugtasks(self):
         """The list of bugtasks targeted to this milestone for listing."""
-        return [self._getListingItem(bugtask) for bugtask in self._bugtasks]
+        return MilestoneBugTaskListingBatchNavigator(self)
 
     @property
     def bugtask_count_text(self):
         """The formatted count of bugs for this milestone."""
-        count = len(self.bugtasks)
+        count = len(self._bugtasks)
         if count == 1:
             return '1 bug'
         else:
@@ -314,12 +384,12 @@
     @property
     def bugtask_status_counts(self):
         """A list StatusCounts summarising the targeted bugtasks."""
-        return get_status_counts(self.bugtasks, 'status')
+        return get_status_counts(self._bugtasks, 'status')
 
     @property
     def specification_count_text(self):
         """The formatted count of specifications for this milestone."""
-        count = len(self.specifications)
+        count = len(self._specifications)
         if count == 1:
             return '1 blueprint'
         else:
@@ -328,12 +398,12 @@
     @property
     def specification_status_counts(self):
         """A list StatusCounts summarising the targeted specification."""
-        return get_status_counts(self.specifications, 'implementation_status')
+        return get_status_counts(self._specifications, 'implementation_status')
 
     @cachedproperty
     def assignment_counts(self):
         """The counts of the items assigned to users."""
-        all_assignments = self.bugtasks + self.specifications
+        all_assignments = self._bugtasks + self._specifications
         return get_status_counts(
             all_assignments, 'assignee', key='displayname')
 
@@ -343,7 +413,7 @@
         all_assignments = []
         if self.user:
             for status_count in get_status_counts(
-                self.specifications, 'assignee', key='displayname'):
+                self._specifications, 'assignee', key='displayname'):
                 if status_count.status == self.user:
                     if status_count.count == 1:
                         status_count.status = 'blueprint'
@@ -351,7 +421,7 @@
                         status_count.status = 'blueprints'
                     all_assignments.append(status_count)
             for status_count in get_status_counts(
-                self.bugtasks, 'assignee', key='displayname'):
+                self._bugtasks, 'assignee', key='displayname'):
                 if status_count.status == self.user:
                     if status_count.count == 1:
                         status_count.status = 'bug'
@@ -386,7 +456,17 @@
     @property
     def has_bugs_or_specs(self):
         """Does the milestone have any bugtasks and specifications?"""
-        return len(self.bugtasks) > 0 or len(self.specifications) > 0
+        return self.has_bugs or self.has_specifications
+
+    @property
+    def has_bugs(self):
+        """Does the milestone have any bugtasks?"""
+        return len(self._bugtasks) > 0
+
+    @property
+    def has_specifications(self):
+        """Does the milestone have any specifications?"""
+        return len(self._specifications) > 0
 
 
 class MilestoneWithoutCountsView(MilestoneView):

=== modified file 'lib/lp/registry/interfaces/milestone.py'
--- lib/lp/registry/interfaces/milestone.py	2011-03-23 13:51:39 +0000
+++ lib/lp/registry/interfaces/milestone.py	2011-10-12 02:44:27 +0000
@@ -12,6 +12,8 @@
     'IHasMilestones',
     'IMilestone',
     'IMilestoneSet',
+    'IMilestoneBugtaskListingBatchNavigator',
+    'IMilestoneSpecificationListingBatchNavigator',
     'IProjectGroupMilestone',
     ]
 
@@ -49,6 +51,7 @@
 from canonical.launchpad.components.apihelpers import (
     patch_plain_parameter_type,
     )
+from canonical.launchpad.webapp.interfaces import ITableBatchNavigator
 from lp.app.validators.name import name_validator
 from lp.bugs.interfaces.bugtarget import (
     IHasBugs,
@@ -291,3 +294,9 @@
 IMilestone['target'].schema = IHasMilestones
 IMilestone['series_target'].schema = IHasMilestones
 IProductRelease['milestone'].schema = IMilestone
+
+class IMilestoneBugtaskListingBatchNavigator(ITableBatchNavigator):
+    """A marker interface for registering the appropriate listings."""
+
+class IMilestoneSpecificationListingBatchNavigator(ITableBatchNavigator):
+    """A marker interface for registering the appropriate listings."""

=== added file 'lib/lp/registry/templates/milestone-bugtask-listing.pt'
--- lib/lp/registry/templates/milestone-bugtask-listing.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/milestone-bugtask-listing.pt	2011-10-12 02:44:27 +0000
@@ -0,0 +1,86 @@
+<div id="bugtask-table-listing"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+>
+  <tal:needs-batch condition="context/has_multiple_pages">
+    <div id="bugtask-batch-links-upper">
+      <tal:navigation replace="structure context/@@+navigation-links-upper" />
+    </div>
+  </tal:needs-batch>
+
+    <table tal:attributes="class context/table_class" id="milestone_bugtasks">
+      <thead>
+        <tr>
+          <th colspan="4">Bug report</th>
+          <th style="width: 14em"
+            tal:condition="context/view/is_project_milestone">
+            Project
+          </th>
+          <th style="width: 9em;">Importance</th>
+          <th style="width: 14em;">Assignee</th>
+          <th style="width: 10em;">Status</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr tal:repeat="bugtask context/bugtasks">
+          <td class="icon left">
+            <span class="sortkey" tal:content="bugtask/bug/id" />
+            <span tal:content="structure bugtask/image:icon" />
+          </td>
+          <td tal:content="string:#${bugtask/bug/id}" class="amount">12345</td>
+          <td>
+            <a tal:attributes="href bugtask/bug/fmt:url"
+               tal:content="bugtask/bug/title">
+               Bug Title Here
+            </a>
+          </td>
+          <td style="padding-right: 5px; text-align:right">
+            <img src="/@@/info" tal:replace="structure bugtask/image:badges" />
+          </td>
+          <td tal:condition="context/view/is_project_milestone">
+            <span class="sortkey" tal:content="bugtask/target/displayname" />
+            <a tal:attributes="href bugtask/milestone/fmt:url"
+               tal:content="bugtask/target/displayname" />
+          </td>
+          <td>
+            <span class="sortkey" tal:content="bugtask/importance/sortkey" />
+            <span tal:content="bugtask/importance/title"
+                  tal:attributes="
+                  class string:importance${bugtask/importance/name}">High</span>
+          </td>
+          <td>
+            <a tal:condition="bugtask/assignee"
+               tal:replace="structure bugtask/assignee/fmt:link" />&nbsp;
+          </td>
+          <td
+            tal:attributes="title bugtask/last_significant_change_date/fmt:displaydate">
+            <span class="sortkey" tal:content="bugtask/status/sortkey" />
+            <span
+                tal:content="bugtask/status/title"
+                tal:attributes="
+                class string:status${bugtask/status/name}">High</span>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <div id="bugtask-batch-links-lower">
+        <tal:navigation replace="structure context/@@+navigation-links-lower" />
+    </div>
+
+  <tal:comment
+    tal:condition="request/features/ajax.batch_navigator.enabled"
+    replace='structure string:&lt;script type="text/javascript"&gt;
+    LPS.use("lp.app.batchnavigator",
+        function(Y) {
+            Y.on("domready", function () {
+                var config = {
+                    contentBox: "#bugtask-table-listing",
+                    query_parameter: "bugtask_batch"
+                };
+                new Y.lp.app.batchnavigator.BatchNavigatorHooks(config);
+            });
+        });
+  &lt;/script&gt;'/>
+
+</div>

=== added file 'lib/lp/registry/templates/milestone-bugtasks-table.pt'
--- lib/lp/registry/templates/milestone-bugtasks-table.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/milestone-bugtasks-table.pt	2011-10-12 02:44:27 +0000
@@ -0,0 +1,3 @@
+<div tal:define="bugtasks view/bugtasks">
+    <tal:bugtasklisting content="structure bugtasks/@@+listing" />
+</div>

=== modified file 'lib/lp/registry/templates/milestone-index.pt'
--- lib/lp/registry/templates/milestone-index.pt	2011-06-16 13:50:58 +0000
+++ lib/lp/registry/templates/milestone-index.pt	2011-10-12 02:44:27 +0000
@@ -219,69 +219,18 @@
           targeted
         </h2>
 
-        <tal:has_specs condition="specs"
+        <tal:has_specs condition="view/has_specifications"
           tal:content="cache:anonymous, view/expire_cache_minutes minute">
-          <table class="listing sortable" id="milestone_specs"
-            style="margin-bottom: 2em;">
-            <thead>
-              <tr>
-                <th colspan="2">Blueprint</th>
-                <th style="width: 14em"
-                  tal:condition="view/is_project_milestone">
-                  Project
-                </th>
-                <th style="width: 9em;">Priority</th>
-                <th style="width: 14em;">Assignee</th>
-                <th style="width: 10em;">Delivery</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr tal:repeat="spec specs">
-                <td class="icon left">
-                  <span tal:content="structure spec/image:icon" />
-                </td>
-                <td>
-                  <a tal:content="spec/title/fmt:shorten/100"
-                     tal:attributes="
-                         href spec/fmt:url;
-                         title spec/summary/fmt:shorten/400">Foo Bar Baz</a>
-                  <img src="/@@/info" alt="Informational"
-                       tal:condition="spec/informational" />
-                </td>
-                <td tal:condition="view/is_project_milestone">
-                    <span class="sortkey" tal:content="spec/product/displayname" />
-                    <a tal:attributes="href spec/milestone/fmt:url"
-                       tal:content="spec/product/displayname" />
-                </td>
-                <td>
-                  <span class="sortkey" tal:content="spec/priority/sortkey" />
-                  <span tal:content="spec/priority/title"
-                        tal:attributes="
-                        class string:specpriority${spec/priority/name}">High</span>
-                </td>
-                <td>
-                  <a tal:condition="spec/assignee"
-                     tal:replace="structure spec/assignee/fmt:link" />&nbsp;
-                </td>
-                <td>
-                  <span class="sortkey"
-                        tal:content="spec/implementation_status/sortkey" />
-                  <span tal:content="spec/implementation_status/title"
-                        tal:attributes="
-                        class string:specdelivery${spec/implementation_status/name}">
-                    Deployment
-                  </span>
-                </td>
-              </tr>
-            </tbody>
-          </table>
+            <div tal:define="specifications view/specifications">
+                <tal:bugtasklisting content="structure specifications/@@+listing" />
+            </div>
         </tal:has_specs>
-
-        <tal:has_bugtasks condition="bugtasks">
-          <tal:cache content="cache:anonymous, view/expire_cache_minutes minute">
-            <tal:milestone-bugtasks
-              metal:use-macro="context/@@+milestone-macros/milestone_bugtasks" />
-          </tal:cache>
+        <p style="margin-bottom: 2em;"></p>
+        <tal:has_bugtasks condition="view/has_bugs"
+          tal:content="cache:anonymous, view/expire_cache_minutes minute">
+            <div tal:define="bugtasks view/bugtasks">
+                <tal:bugtasklisting content="structure bugtasks/@@+listing" />
+            </div>
         </tal:has_bugtasks>
 
         <tal:neither_bugs_nor_specs condition="not: view/has_bugs_or_specs">

=== removed file 'lib/lp/registry/templates/milestone-macros.pt'
--- lib/lp/registry/templates/milestone-macros.pt	2010-05-27 04:10:17 +0000
+++ lib/lp/registry/templates/milestone-macros.pt	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-<tal:root
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  omit-tag="">
-
-
-
-  <tal:milestone-bugtasks metal:define-macro="milestone_bugtasks">
-    <table class="listing sortable" id="milestone_bugtasks">
-      <thead>
-        <tr>
-          <th colspan="4">Bug report</th>
-          <th style="width: 14em"
-            tal:condition="view/is_project_milestone">
-            Project
-          </th>
-          <th style="width: 9em;">Importance</th>
-          <th style="width: 14em;">Assignee</th>
-          <th style="width: 10em;">Status</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="bugtask bugtasks">
-          <td class="icon left">
-            <span class="sortkey" tal:content="bugtask/bug/id" />
-            <span tal:content="structure bugtask/image:icon" />
-          </td>
-          <td tal:content="string:#${bugtask/bug/id}" class="amount">12345</td>
-          <td>
-            <a tal:attributes="href bugtask/bug/fmt:url"
-               tal:content="bugtask/bug/title">
-               Bug Title Here
-            </a>
-          </td>
-          <td style="padding-right: 5px; text-align:right">
-            <img src="/@@/info" tal:replace="structure bugtask/image:badges" />
-          </td>
-          <td tal:condition="view/is_project_milestone">
-            <span class="sortkey" tal:content="bugtask/target/displayname" />
-            <a tal:attributes="href bugtask/milestone/fmt:url"
-               tal:content="bugtask/target/displayname" />
-          </td>
-          <td>
-            <span class="sortkey" tal:content="bugtask/importance/sortkey" />
-            <span tal:content="bugtask/importance/title"
-                  tal:attributes="
-                  class string:importance${bugtask/importance/name}">High</span>
-          </td>
-          <td>
-            <a tal:condition="bugtask/assignee"
-               tal:replace="structure bugtask/assignee/fmt:link" />&nbsp;
-          </td>
-          <td
-            tal:attributes="title bugtask/last_significant_change_date/fmt:displaydate">
-            <span class="sortkey" tal:content="bugtask/status/sortkey" />
-            <span
-                tal:content="bugtask/status/title"
-                tal:attributes="
-                class string:status${bugtask/status/name}">High</span>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </tal:milestone-bugtasks>
-</tal:root>

=== added file 'lib/lp/registry/templates/milestone-specification-listing.pt'
--- lib/lp/registry/templates/milestone-specification-listing.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/milestone-specification-listing.pt	2011-10-12 02:44:27 +0000
@@ -0,0 +1,83 @@
+<div id="specification-table-listing"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+>
+  <tal:needs-batch condition="context/has_multiple_pages">
+    <div id="specification-batch-links-upper">
+      <tal:navigation replace="structure context/@@+navigation-links-upper" />
+    </div>
+  </tal:needs-batch>
+
+    <table tal:attributes="class context/table_class" id="milestone_specifications">
+        <thead>
+          <tr>
+            <th colspan="2">Blueprint</th>
+            <th style="width: 14em"
+              tal:condition="context/view/is_project_milestone">
+              Project
+            </th>
+            <th style="width: 9em;">Priority</th>
+            <th style="width: 14em;">Assignee</th>
+            <th style="width: 10em;">Delivery</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="spec context/specifications">
+            <td class="icon left">
+              <span tal:content="structure spec/image:icon" />
+            </td>
+            <td>
+              <a tal:content="spec/title/fmt:shorten/100"
+                 tal:attributes="
+                     href spec/fmt:url;
+                     title spec/summary/fmt:shorten/400">Foo Bar Baz</a>
+              <img src="/@@/info" alt="Informational"
+                   tal:condition="spec/informational" />
+            </td>
+            <td tal:condition="context/view/is_project_milestone">
+                <span class="sortkey" tal:content="spec/product/displayname" />
+                <a tal:attributes="href spec/milestone/fmt:url"
+                   tal:content="spec/product/displayname" />
+            </td>
+            <td>
+              <span class="sortkey" tal:content="spec/priority/sortkey" />
+              <span tal:content="spec/priority/title"
+                    tal:attributes="
+                    class string:specpriority${spec/priority/name}">High</span>
+            </td>
+            <td>
+              <a tal:condition="spec/assignee"
+                 tal:replace="structure spec/assignee/fmt:link" />&nbsp;
+            </td>
+            <td>
+              <span class="sortkey"
+                    tal:content="spec/implementation_status/sortkey" />
+              <span tal:content="spec/implementation_status/title"
+                    tal:attributes="
+                    class string:specdelivery${spec/implementation_status/name}">
+                Deployment
+              </span>
+            </td>
+          </tr>
+        </tbody>
+    </table>
+
+    <div id="specification-batch-links-lower">
+        <tal:navigation replace="structure context/@@+navigation-links-lower" />
+    </div>
+
+  <tal:comment
+    tal:condition="request/features/ajax.batch_navigator.enabled"
+    replace='structure string:&lt;script type="text/javascript"&gt;
+    LPS.use("lp.app.batchnavigator",
+        function(Y) {
+            Y.on("domready", function () {
+                var config = {
+                    contentBox: "#specification-table-listing",
+                    query_parameter: "specification_batch"
+                };
+                new Y.lp.app.batchnavigator.BatchNavigatorHooks(config);
+            });
+        });
+  &lt;/script&gt;'/>
+</div>

=== added file 'lib/lp/registry/templates/milestone-specifications-table.pt'
--- lib/lp/registry/templates/milestone-specifications-table.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/milestone-specifications-table.pt	2011-10-12 02:44:27 +0000
@@ -0,0 +1,3 @@
+<div tal:define="specifications view/specifications">
+    <tal:specificationlisting content="structure specifications/@@+listing" />
+</div>