Merge lp:~deryck/launchpad/wrong-bug-number-edit-page-439449 into lp:launchpad

[Deryck Hodge]

[Deryck Hodge (deryck)]

This fixes bug 439449. We were using bugtask.id instead of bug.id on
title and heading (label and page_title) for a bug's +edit page.

I added a small test to cover that the correct bug ID is displayed, too.

./bin/test -vv -t xx-bug-edit.txt

= Launchpad lint =

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

Linting changed files:
  lib/lp/bugs/browser/bug.py
  lib/lp/bugs/stories/bugs/xx-bug-edit.txt

== Pylint notices ==

lib/lp/bugs/browser/bug.py
    44: [F0401] Unable to import 'lazr.enum' (No module named enum)
    45: [F0401] Unable to import 'lazr.lifecycle.event' (No module named
lifecycle)
    46: [F0401] Unable to import 'lazr.lifecycle.snapshot' (No module
named lifecycle)
    47: [F0401] Unable to import 'lazr.restful.interfaces' (No module
named restful)

[Gavin Panella (allenap)]

<allenap> deryck: Perhaps add a comment to BugEditView.__init__ saying that context is always an IBugTask.
<deryck> allenap, sure, I can do that.

review: Approve

[Michael Nelson (michael.nelson)]

OK, given this is very small and persuaded that it's quite important :)

review: Approve (release-critical)

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2009-10-26 14:33:26 +0000
+++ lib/lp/bugs/browser/bug.py	2009-10-30 16:31:13 +0000
@@ -560,13 +560,14 @@
     _confirm_new_tags = False
 
     def __init__(self, context, request):
+        """context is always an IBugTask."""
         BugEditViewBase.__init__(self, context, request)
         self.notifications = []
 
     @property
     def label(self):
         """The form label."""
-        return 'Edit details for bug #%d' % self.context.id
+        return 'Edit details for bug #%d' % self.context.bug.id
 
     @property
     def page_title(self):

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-edit.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-edit.txt	2009-08-12 11:49:59 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-edit.txt	2009-10-30 16:31:13 +0000
@@ -13,6 +13,17 @@
   ...
   ...blackhole is already in use by another bug...
 
+The user should be able to look at the page title or heading and
+see the bug number being edited.
+
+  >>> user_browser.open(
+  ...     'http://bugs.launchpad.dev/jokosher/+bug/11/+edit')
+  >>> print user_browser.title
+  Edit details for bug #11 ...
+  >>> main = find_main_content(user_browser.contents)
+  >>> print extract_text(main.h1)
+  Edit details for bug #11
+
 And now we show that any logged-in user can edit public bugs. 
 
   >>> browser = setupBrowser(auth='Basic [e-mail]:test')