Merge lp:~allenap/launchpad/ui-convert-filebug-3.0-bug-415263-search into lp:launchpad

[Gavin Panella]

[Gavin Panella (allenap)]

This converts the +filebug search page to the 3.0 layout, using the
main_only layout. This included removing the "Most frequently reported
bugs" area, which, after discussion with noodles, wgrant and beuno, is
basically not very useful, especially in comparison with the more
accurate, detailed and useful duplicate listing shown on the following
page.

Test: ./bin/test -vvt filebug

Lint free.

lib/lp/bugs/browser/bugtarget.py

  Removed the most_common_bugs and found_possible_duplicates
  properties. The first, most_common_bugs, was only used by the "Most
  frequently reported bugs" area, and found_possible_duplicates was
  already unused.

  Also, I removed a little lint.

lib/lp/bugs/doc/minimizing-duplicate-bug-reports.txt

  I also removed the IBugTarget.getMostCommonBugs() method because,
  list the most_common_bugs property above, was only used for the
  +filebug search page. This test was entirely about
  getMostCommonBugs(), so I removed it too.

lib/lp/bugs/interfaces/bugtarget.py
lib/lp/bugs/model/bugtarget.py

  getMostCommonBugs() removed.

lib/lp/bugs/stories/guided-filebug/xx-displaying-similar-bugs.txt
lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug.txt
lib/lp/bugs/stories/guided-filebug/xx-distro-sourcepackage-guided-filebug.txt
lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt

  "Most frequently reported bugs" area removed, so tests for it
  removed too.

lib/lp/bugs/templates/bugtarget-filebug-search.pt

  Template converted. The only interesting thing here was the extra
  condition around the not_uses_malone macro call. The not_uses_malone
  macro already checks the same condition, but I think that the
  condition should be checked in the calling template instead. Once
  the other templates that use the not_uses_malone macro have been
  converted to follow this style, the condition in the macro will be
  removed.

lib/lp/bugs/tests/bug.py

  The print_bugs_table() helper was only used in one place. That place
  has now gone, so the helper goes too.

lib/lp/registry/configure.zcml

  Remove getMostCommonBugs.

[Michael Nelson (michael.nelson)]

Hi Gavin,

It looks *so* much friendlier!

As I mentioned via irc, I had a few things that I was uncertain about - so I'll need to defer to Martin or Curtis:

1. At first I thought that you should be using the default <h2>context.title</h2> in the 'heading' slot - but then you rightly pointed out that this would fall into the case of the same heading twice - so we think that overriding with the h1 heading is correct (fits with Curtis' email "because showing two identical titles is stupid" but the page_title is *not* the same as the context.title here - hence the uncertainty).

2. Since you are (currently) over-riding the heading slot with an h1, you will not define view.label, otherwise the form machinery will add a second h1 to the page.

3. I'm aware that the way we designate privacy generally has changed (see base-layout.pt), but in your case you're indicating that the future bug to be created will be private - I don't know if this needs to follow the same style? Martin?

Sorry - that wasn't much help in terms of a review :/

<noodles775> Thanks allenap.... initial thoughts - it looks *much* friendlier!
<allenap> noodles775: The diff generated is complete rubbish :( I forget to target the branch to devel.
<noodles775> np.
<allenap> noodles775: But, yeah, it does look much better :)
<allenap> noodles775: I'm going to recreate the mp, so don't comment on it yet.
<noodles775> ok
* sinzui has quit (Remote closed the connection)
<allenap> noodles775: https://code.edge.launchpad.net/~allenap/launchpad/ui-convert-filebug-3.0-bug-415263-search/+merge/10321
<noodles775> allenap: have you made ff a private project for that screenshot? Or why is the report private by default there (I saw that it's not locally)
<allenap> noodles775: I set bugs private by default for ff.
<noodles775> allenap: OK, so it looks great, but there are two things I'm uncertain about.
<allenap> noodles775: Hit me with the bad news!
<noodles775> allenap: first, you've used <h1>Report a bug</h1> in the 'heading' slot, where as, if I've understood sinzui's email correctly, that should be displaying the default h2 context.title there,
<noodles775> allenap: and your h1 should be displayed by lpform macro automatically (if you define view.label).
<noodles775> allenap: secondly, I haven't seen the latest discussions on the privacy indicators, but I thought we were using a global privacy indicator, rather than custom ones like you've put into the 'heading' slot there?
* noodles775 checks the template.
<allenap> noodles775: The first point - displaying context.title in the heading slot - seems strange. The title is already on the page, just above.
<allenap> noodles775: The second point - view.label - I'll look into now.
* jtv has quit ("Leaving.")
<allenap> noodles775: The privacy indicator was preserved from the old version of the template. I don't know what the new style is for private things, but I'm happy to adopt it :)
<noodles775> allenap: the view.label for forms is described in the email on lp-dev.
<noodles775> allenap: and yes, with the first point, I think you're right - it fits into the case where displaying the same heading twice is silly :)
* henninge has quit ("Ex-Chat")
...

review: Approve (ui)

[Michael Nelson (michael.nelson)]

I meant to save the previous one with Needs Information.

review: Needs Information (ui)

[Michael Nelson (michael.nelson)]

> Hi Gavin,
>
> It looks *so* much friendlier!
>
> As I mentioned via irc, I had a few things that I was uncertain about - so
> I'll need to defer to Martin or Curtis:
>
> 1. At first I thought that you should be using the default
> <h2>context.title</h2> in the 'heading' slot - but then you rightly pointed
> out that this would fall into the case of the same heading twice - so we think
> that overriding with the h1 heading is correct (fits with Curtis' email
> "because showing two identical titles is stupid" but the page_title is *not*
> the same as the context.title here - hence the uncertainty).
>

But:

noodles775> allenap: actually, I just realised - you've got two h1's there - as the heading in the branding is already h1 - so you should definitely be using an h2 in the 'heading' fill-slot.
<noodles775> Here's a good example to work from: https://edge.launchpad.net/ubuntu/+search
<noodles775> (Curtis did that one :) ).

And looking at some other approved landings:

https://edge.launchpad.net/ubuntu/+ppas

it looks like you should be using the default h2 for the breadcrumb heading even though it repeats the heading, and the form's view.label defining the h1 heading in the main content.

Again, I'm sorry that I can't yet be more definitive :/.

[Brad Crittenden (bac)]

The code looks good Gavin.

review: Approve (code)

[Martin Albisetti (beuno)]

Hi Gavin,

This looks so much better without that initial list. Good call.
I do have, however, comments:

- The second step of the bug report shows me the old UI, even though it appears to be the same URL. Could you make sure that this only lands with both steps using the same UI?
- How about moving the "continue" button right next to the input, and maybe rename it to "next", like in our 3.0 mockup? https://wiki.canonical.com/Launchpad/UI/Bugs/ThreeDotO/FileBug
- You have 2 h1's on the page. There should only be 1, in this case, the "Report a bug". The projects' name should be an h2. Talk to Curtis if you're not sure how to fix that

Otherwise, looking forward to this landing.

review: Needs Fixing (ui)

[Gavin Panella (allenap)]

> Hi Gavin,
>
> This looks so much better without that initial list. Good call.
> I do have, however, comments:

Thanks for looking at it :)

>
> - The second step of the bug report shows me the old UI, even though it
> appears to be the same URL. Could you make sure that this only lands with both
> steps using the same UI?

Sure. I already have a follow-on branch that does this, so I'll land
them together.

> - How about moving the "continue" button right next to the input, and maybe
> rename it to "next", like in our 3.0 mockup?
> https://wiki.canonical.com/Launchpad/UI/Bugs/ThreeDotO/FileBug

The form is being rendered by launchpad-form, which does not allow
more than one widget per row. To get the button to display on the same
row means either doing big work on launchpad-form, or bypassing it,
which would lose us a lot and adds a big maintenance overhead.

Also, as Bjorn has just mentioned in our stand-up call, we very much
need to pick up the pace of template conversions, so I'd like to leave
these kinds of changes for the second round.

Can we leave this for now, and perhaps schedule some work on
launchpad-form?

> - You have 2 h1's on the page. There should only be 1, in this case, the
> "Report a bug". The projects' name should be an h2. Talk to Curtis if you're
> not sure how to fix that

This seems to be a rule in the location_heading formatter:

        if not IHasLogo.providedBy(context):
            context = nearest(context, IHasLogo)
            heading = 'h2'
        else:
            heading = 'h1'

On the +filebug page, the context is the project (or distribution,
etc), so this is always going to end up as an h1. I'll talk to Curtis
about it.

For now, I've changed the "Report a bug" to an h2, which noodles
suggested.

Gavin.

[Martin Albisetti (beuno)]

> The form is being rendered by launchpad-form, which does not allow
> more than one widget per row. To get the button to display on the same
> row means either doing big work on launchpad-form, or bypassing it,
> which would lose us a lot and adds a big maintenance overhead.

I really hate these zope forms.

> Also, as Bjorn has just mentioned in our stand-up call, we very much
> need to pick up the pace of template conversions, so I'd like to leave
> these kinds of changes for the second round.
>
> Can we leave this for now, and perhaps schedule some work on
> launchpad-form?

Yes, go for it.

> For now, I've changed the "Report a bug" to an h2, which noodles
> suggested.

Great, thank you.

review: Approve (ui)

[Michael Nelson (michael.nelson)]

review: Approve (ui)

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2009-08-17 17:09:23 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2009-08-18 11:14:07 +0000
@@ -463,7 +463,6 @@
         security_related = data.get("security_related", False)
         distribution = data.get(
             "distribution", getUtility(ILaunchBag).distribution)
-        product = getUtility(ILaunchBag).product
 
         context = self.context
         if distribution is not None:
@@ -897,20 +896,6 @@
 
         return search_context
 
-    @cachedproperty
-    def most_common_bugs(self):
-        """Return a list of the most duplicated bugs."""
-        search_context = self.search_context
-        if search_context is None:
-            return []
-        else:
-            return search_context.getMostCommonBugs(
-                self.user, limit=self._MATCHING_BUGS_LIMIT)
-
-    @property
-    def found_possible_duplicates(self):
-        return self.similar_bugs or self.most_common_bugs
-
     @property
     def search_text(self):
         """Return the search string entered by the user."""
@@ -972,18 +957,6 @@
             " product the user selected.")
         return self.widgets['product'].getInputValue()
 
-    @cachedproperty
-    def most_common_bugs(self):
-        """Return a list of the most duplicated bugs."""
-        # We can only discover the most common bugs when a product has
-        # been selected.
-        if self.widgets['product'].hasValidInput():
-            selected_product = self._getSelectedProduct()
-            return selected_product.getMostCommonBugs(
-                self.user, limit=self._MATCHING_BUGS_LIMIT)
-        else:
-            return []
-
     def getSecurityContext(self):
         """See FileBugViewBase."""
         return self._getSelectedProduct()
@@ -1098,7 +1071,7 @@
         """See FileBugViewBase."""
         try:
             bugtarget = self.widgets['bugtarget'].getInputValue()
-        except InputErrors, error:
+        except InputErrors:
             return None
         if IDistributionSourcePackage.providedBy(bugtarget):
             return bugtarget.distribution

=== removed file 'lib/lp/bugs/doc/minimizing-duplicate-bug-reports.txt'
--- lib/lp/bugs/doc/minimizing-duplicate-bug-reports.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/doc/minimizing-duplicate-bug-reports.txt	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-Minimizing Duplicate Bug Reports
-================================
-
-Malone does its best to discourage duplicate bug report filing. The
-default filebug workflow, for example, guides the user through a search
-for duplicate bugs before allowing the bug to actually be filed.
-
-IBugTarget has a getMostCommonBugs() method which returns a list of bugs
-ordered by number of dupes, most-duped to least-duped.
-
-(First, let's add some more duplicate bug sample data.)
-
-    >>> from zope.component import getUtility
-    >>> from canonical.database.sqlbase import flush_database_updates
-    >>> from canonical.launchpad.interfaces import (
-    ...     IBugSet, CreateBugParams, IDistributionSet, IProductSet,
-    ...     ILaunchBag)
-
-    >>> login("[e-mail]")
-
-    >>> bugset = getUtility(IBugSet)
-    >>> bug_five = bugset.get(5)
-    >>> bug_one = bugset.get(1)
-
-    >>> firefox = getUtility(IProductSet).getByName("firefox")
-    >>> ubuntu = getUtility(IDistributionSet).getByName("ubuntu")
-    >>> ubuntu_firefox = ubuntu.getSourcePackage("mozilla-firefox")
-    >>> current_user = getUtility(ILaunchBag).user
-    >>> params = CreateBugParams(
-    ...     owner=current_user, title="a duplicate bug",
-    ...     comment="this bug is a duplicate")
-    >>> bug_five_dupe = firefox.createBug(params)
-    >>> bug_five_dupe.duplicateof = bug_five
-    >>> bug_one_dupe = firefox.createBug(params)
-    >>> bug_one_dupe.duplicateof = bug_one
-
-    >>> flush_database_updates()
-
-By default, 10 bugs are returned by getMostCommonBugs().
-
-    >>> for bug in firefox.getMostCommonBugs(current_user):
-    ...     print "%s, %s" % (bug.title, bug.duplicates.count())
-    Firefox install instructions should be complete, 2
-    Firefox does not support SVG, 1
-
-    >>> for bug in ubuntu_firefox.getMostCommonBugs(current_user):
-    ...     print "%s, %s" % (bug.title, bug.duplicates.count())
-    Firefox does not support SVG, 1
-
-If we ask for just one bug, we get only one.
-
-    >>> for bug in firefox.getMostCommonBugs(current_user, limit=1):
-    ...     print "%s, %s" % (bug.title, bug.duplicates.count())
-    Firefox install instructions should be complete, 2
-
-getMostCommonBugs() is also privacy aware. If bug one is marked
-private, we will no longer see it in the results, because no-priv is
-not subscribed to the bug. Note that setPrivate adds all indirect
-subscribers as direct subscribers to the bug so we must unsubscribe
-immediately.
-
-    >>> print current_user.name
-    no-priv
-
-    >>> bug_one.isSubscribed(current_user)
-    False
-    >>> bug_one.setPrivate(True, current_user)
-    True
-    >>> bug_one.isSubscribed(current_user)
-    True
-    >>> bug_one.unsubscribe(current_user, current_user)
-    >>> flush_database_updates()
-
-    >>> for bug in firefox.getMostCommonBugs(current_user):
-    ...     print "%s, %s" % (bug.title, bug.duplicates.count())
-    Firefox install instructions should be complete, 2
-
-An admin will, of course, see the private bug.
-
-    >>> login("[e-mail]")
-
-    >>> current_user = getUtility(ILaunchBag).user
-
-    >>> for bug in firefox.getMostCommonBugs(current_user):
-    ...     print "%s, %s" % (bug.title, bug.duplicates.count())
-    Firefox install instructions should be complete, 2
-    Firefox does not support SVG, 1
-
-When the context has no duplicate bugs, an empty list is returned.
-
-    >>> from canonical.launchpad.interfaces import IDistributionSet
-
-    >>> kubuntu = getUtility(IDistributionSet).getByName("kubuntu")
-    >>> kubuntu.getMostCommonBugs(current_user)
-    []

=== modified file 'lib/lp/bugs/interfaces/bugtarget.py'
--- lib/lp/bugs/interfaces/bugtarget.py	2009-07-17 00:26:05 +0000
+++ lib/lp/bugs/interfaces/bugtarget.py	2009-08-18 11:12:06 +0000
@@ -244,13 +244,6 @@
             required=False,
             max_length=50000))
 
-    def getMostCommonBugs(user, limit=10):
-        """Return the list of most commonly-reported bugs.
-
-        This is the list of bugs that have the most dupes, ordered from
-        most to least duped.
-        """
-
     def createBug(bug_params):
         """Create a new bug on this target.
 

=== modified file 'lib/lp/bugs/model/bugtarget.py'
--- lib/lp/bugs/model/bugtarget.py	2009-07-17 00:26:05 +0000
+++ lib/lp/bugs/model/bugtarget.py	2009-08-18 11:14:07 +0000
@@ -162,7 +162,6 @@
             statuses = BugTaskStatus.items
         statuses = list(statuses)
 
-        from_tables = ['BugTask', 'Bug']
         count_column = """
             COUNT (CASE WHEN BugTask.status = %s
                         THEN BugTask.id ELSE NULL END)"""
@@ -190,37 +189,6 @@
 
     All IBugTargets should inherit from this class.
     """
-    def getMostCommonBugs(self, user, limit=10):
-        """See canonical.launchpad.interfaces.IBugTarget."""
-        constraints = []
-        bug_privacy_clause = get_bug_privacy_filter(user)
-        if bug_privacy_clause:
-            constraints.append(bug_privacy_clause)
-        constraints.append(self._getBugTaskContextWhereClause())
-        c = cursor()
-        c.execute("""
-        SELECT duplicateof, COUNT(duplicateof)
-        FROM Bug
-        WHERE duplicateof IN (
-            SELECT DISTINCT(Bug.id)
-            FROM Bug, BugTask
-            WHERE BugTask.bug = Bug.id AND
-            %s)
-        GROUP BY duplicateof
-        ORDER BY COUNT(duplicateof) DESC
-        LIMIT %d
-        """ % ("AND\n".join(constraints), limit))
-
-        common_bug_ids = [
-            str(bug_id) for (bug_id, dupe_count) in c.fetchall()]
-
-        if not common_bug_ids:
-            return []
-        # import this database class here, in order to avoid
-        # circular dependencies.
-        from lp.bugs.model.bug import Bug
-        return list(
-            Bug.select("Bug.id IN (%s)" % ", ".join(common_bug_ids)))
 
 
 class OfficialBugTagTargetMixin:

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-displaying-similar-bugs.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-displaying-similar-bugs.txt	2009-07-31 17:30:34 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-displaying-similar-bugs.txt	2009-08-18 11:04:38 +0000
@@ -28,8 +28,6 @@
 the summary entered (assuming some are found).
 
     >>> user_browser.open("http://bugs.launchpad.dev/firefox/+filebug")
-    >>> print find_tag_by_id(user_browser.contents, 'frequent-bugs')
-    <h2 id="frequent-bugs">Most frequently reported bugs</h2>
     >>> user_browser.getControl("Summary").value = 'a'
     >>> user_browser.getControl("Continue").click()
 

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug.txt	2009-07-15 13:22:29 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug.txt	2009-08-18 11:04:38 +0000
@@ -5,14 +5,6 @@
 
     >>> user_browser.open("http://launchpad.dev/ubuntu/+filebug")
 
-There are no duplicate bugs reported in Ubuntu so the most common bugs
-table is not shown.
-
-    >>> most_common_bugs_table = find_tag_by_id(
-    ...     user_browser.contents, "most-common-bugs")
-    >>> print most_common_bugs_table
-    None
-
 Submitting a bug title...
 
     >>> user_browser.getControl("Summary").value = (

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-distro-sourcepackage-guided-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-distro-sourcepackage-guided-filebug.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-distro-sourcepackage-guided-filebug.txt	2009-08-18 11:04:38 +0000
@@ -22,13 +22,6 @@
     <...
     No similar bug reports were found...
 
-And no duplicated bugs in this package.
-
-    >>> most_common_bugs_table = find_tag_by_id(
-    ...     user_browser.contents, "most-common-bugs")
-    >>> most_common_bugs_table is None
-    True
-
 The filebug form looks similar to the normal distro form, but the
 package name is prepopulated.
 

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt	2009-07-15 13:22:29 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-product-guided-filebug.txt	2009-08-18 11:04:38 +0000
@@ -7,14 +7,6 @@
     >>> user_browser.open("http://bugs.launchpad.dev/firefox")
     >>> user_browser.getLink('Report a bug').click()
 
-On this page and the user is shown a table of the most common bugs in
-the current context.
-
-    >>> from lp.bugs.tests.bug import print_bugs_table
-
-    >>> print_bugs_table(user_browser.contents, "most-common-bugs")
-    5 Firefox install instructions should be complete
-
 If no title is entered, the user is asked to supply one.
 
     >>> user_browser.getControl('Summary').value

=== modified file 'lib/lp/bugs/templates/bugtarget-filebug-search.pt'
--- lib/lp/bugs/templates/bugtarget-filebug-search.pt	2009-07-31 17:30:34 +0000
+++ lib/lp/bugs/templates/bugtarget-filebug-search.pt	2009-08-18 11:04:38 +0000
@@ -1,90 +1,60 @@
-<html
+<filebug-search
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  xml:lang="en"
-  lang="en"
-  dir="ltr"
-  metal:use-macro="view/macro:page/onecolumn"
->
-<body>
-
-<metal:leftportlets fill-slot="portlets_one">
-  <div tal:replace="structure context/@@+portlet-latestbugs|nothing" />
-</metal:leftportlets>
-
-<div metal:fill-slot="main">
-
-      <div tal:condition="view/isPrivate" id="privacy" class="aside private"
-      >This report will be private, though you can disclose it later.</div>
-      <h1>Report a bug</h1>
-
-<metal:not_uses_malone
-    use-macro="context/@@+filebug-macros/not_uses_malone" />
-
-<tal:uses_malone tal:condition="view/contextUsesMalone">
-  <div metal:use-macro="context/@@launchpad_form/form">
-    <table class="form" metal:fill-slot="widgets">
-
-      <tal:product_widget
-          tal:define="widget nocall:view/widgets/product|nothing"
-          tal:condition="widget">
-        <metal:widget metal:use-macro="context/@@launchpad_form/widget_row" />
-      </tal:product_widget>
-
-      <tal:bugtarget
-          tal:define="widget nocall:view/widgets/bugtarget|nothing"
-          tal:condition="widget">
-        <metal:widget metal:use-macro="context/@@launchpad_form/widget_row" />
-      </tal:bugtarget>
-
-      <tal:hidden_tags tal:replace="structure view/widgets/tags/hidden" />
-
-      <tr>
-        <td colspan="2">
-          <p>
-        Please describe the bug in a few words, for example, "weather
-        applet crashes on logout":
-          </p>
-        </td>
-      </tr>
-      <tal:title_widget tal:define="widget nocall:view/widgets/title">
-        <metal:widget use-macro="context/@@launchpad_form/widget_row" />
-      </tal:title_widget>
-    </table>
-
-    <div class="actions" metal:fill-slot="buttons">
-      <input tal:replace="structure view/actions/field.actions.search/render" />
-    </div>
-  </div>
-
-  <tal:most-common-bugs condition="view/most_common_bugs">
-    <h2 id="frequent-bugs">Most frequently reported bugs</h2>
-
-    <table class="listing" id="most-common-bugs">
-      <thead>
-        <tr><th colspan="2">Summary</th></tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="bug view/most_common_bugs"
-            tal:attributes="title bug/description/fmt:shorten/150"
-            title="bug description goes here">
-          <td class="amount" tal:content="bug/id" width="10%">1</td>
-          <td>
-            <a href="#"
-               tal:content="bug/title"
-               tal:attributes="href bug/fmt:url">
-              Firefox doesn't work
-            </a>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </tal:most-common-bugs>
-</tal:uses_malone>
-
-
-    </div>
-  </body>
-</html>
+  metal:use-macro="view/macro:page/main_only">
+
+  <div metal:fill-slot="heading">
+    <div tal:condition="view/isPrivate" id="privacy" class="aside private">
+      This report will be private, though you can disclose it later.
+    </div>
+    <h1>Report a bug</h1>
+  </div>
+
+  <div metal:fill-slot="main">
+    <div class="yui-g">
+
+      <tal:does-not-use-malone condition="not: view/contextUsesMalone">
+        <div class="top-portlet">
+          <metal:not_uses_malone
+              use-macro="context/@@+filebug-macros/not_uses_malone" />
+        </div>
+      </tal:does-not-use-malone>
+
+      <tal:uses-malone tal:condition="view/contextUsesMalone">
+        <div class="top-portlet">
+          <div metal:use-macro="context/@@launchpad_form/form">
+            <table class="form" metal:fill-slot="widgets">
+              <tal:product_widget
+                  tal:define="widget nocall:view/widgets/product|nothing"
+                  tal:condition="widget">
+                <metal:widget metal:use-macro="context/@@launchpad_form/widget_row" />
+              </tal:product_widget>
+              <tal:bugtarget
+                  tal:define="widget nocall:view/widgets/bugtarget|nothing"
+                  tal:condition="widget">
+                <metal:widget metal:use-macro="context/@@launchpad_form/widget_row" />
+              </tal:bugtarget>
+              <tal:hidden_tags tal:replace="structure view/widgets/tags/hidden" />
+              <tr>
+                <td colspan="2">
+                  Please describe the bug in a few words, for example,
+                  "weather applet crashes on logout":
+                </td>
+              </tr>
+              <tal:title_widget tal:define="widget nocall:view/widgets/title">
+                <metal:widget use-macro="context/@@launchpad_form/widget_row" />
+              </tal:title_widget>
+            </table>
+            <div class="actions" metal:fill-slot="buttons">
+              <input tal:replace="structure view/actions/field.actions.search/render" />
+            </div>
+          </div>
+        </div>
+      </tal:uses-malone>
+
+    </div>
+  </div>
+
+</filebug-search>

=== modified file 'lib/lp/bugs/tests/bug.py'
--- lib/lp/bugs/tests/bug.py	2009-06-25 00:40:31 +0000
+++ lib/lp/bugs/tests/bug.py	2009-08-18 11:04:38 +0000
@@ -90,21 +90,6 @@
                 print target, extract_text(span.findNext('a'))
 
 
-def print_bugs_table(content, table_id):
-    """Print the bugs table with the given ID.
-
-    The table is assumed to consist of rows of bugs whose first column
-    is a bug ID, and whose second column is a bug title.
-    """
-    bugs_table = find_tag_by_id(content, table_id)
-
-    for tr in bugs_table("tr"):
-        if not tr.td:
-            continue
-        bug_id, bug_title = tr("td", limit=2)
-        print bug_id.string, bug_title.a.string
-
-
 def print_bugs_list(content, list_id):
     """Print the bugs list with the given ID.
 

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2009-08-12 05:09:36 +0000
+++ lib/lp/registry/configure.zcml	2009-08-18 11:12:06 +0000
@@ -387,7 +387,6 @@
                 getUsedBugTagsWithOpenCounts
                 bugtargetdisplayname
                 bugtargetname
-                getMostCommonBugs
                 getBugCounts
                 bug_subscriptions
                 getSubscriptions