Merge lp:~rockstar/launchpad/bug-326592 into lp:launchpad

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi there-

  This branch fixes bug# 326592. Basically, the branch deletion requirements
needed to link to the bug, not the bugbranch (since we're trying to hide the
bugbranch stuff away). The link is now fixed.

  One caveat, however, was that the link formatter for bugs doesn't set the
icon properly. I talked with Deryck about it, and it's a known issue. This
means I had to get the sprite icon from the IBug.default_bugtask. This issue
was pointed out to me by Aaron.

  To test: test -vvtc xx-bug-branch-links.txt

Cheers,
Paul

[Aaron Bentley (abentley)]

review: Approve

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2010-02-22 01:44:55 +0000
+++ lib/lp/code/model/branch.py	2010-02-24 17:14:18 +0000
@@ -609,7 +609,7 @@
 
         for bugbranch in self.bug_branches:
             deletion_operations.append(
-                DeletionCallable(bugbranch,
+                DeletionCallable(bugbranch.bug.default_bugtask,
                 _('This bug is linked to this branch.'),
                 bugbranch.destroySelf))
         for spec_link in self.spec_links:

=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2010-02-02 22:26:04 +0000
+++ lib/lp/code/model/tests/test_branch.py	2010-02-24 17:14:18 +0000
@@ -867,7 +867,7 @@
         """Deletion requirements for a branch with a bug are right."""
         bug = self.factory.makeBug()
         bug.linkBranch(self.branch, self.branch.owner)
-        self.assertEqual({bug.linked_branches[0]:
+        self.assertEqual({bug.default_bugtask:
             ('delete', _('This bug is linked to this branch.'))},
             self.branch.deletionRequirements())
 

=== modified file 'lib/lp/code/stories/branches/xx-bug-branch-links.txt'
--- lib/lp/code/stories/branches/xx-bug-branch-links.txt	2009-11-17 09:08:17 +0000
+++ lib/lp/code/stories/branches/xx-bug-branch-links.txt	2010-02-24 17:14:18 +0000
@@ -1,10 +1,13 @@
-= Bug branch links =
+================
+Bug branch links
+================
 
 It is possible to link bugs and branches from both the bug page and the branch
 page.
 
 
-== From the branch page ==
+From the branch page
+====================
 
 There is a "Link to a bug report" item in the actions menu that is visible
 to everybody but which links to a page restricted with the
@@ -98,7 +101,8 @@
     No bug branch links
 
 
-== From the bug page ==
+From the bug page
+=================
 
 The action link on the bug page is "Link a related branch".  Again this
 links to a page restricted with the launchpad.AnyPerson permission.
@@ -129,7 +133,8 @@
     Bug #11: Make Jokosher use autoaudiosink (Undecided – New)
 
 
-=== Quick branch registration ===
+Quick branch registration
+=========================
 
 You can also register a branch at the same time as registering a bug-branch
 link. Instead of entering the unique name of a branch, you can enter a URL:
@@ -182,7 +187,8 @@
     No bug branch links
 
 
-== Deleting bug branch links ==
+Deleting bug branch links
+=========================
 
 The edit view for the bug branch also now has a delete button to unlink
 the bug from the branch.
@@ -192,3 +198,23 @@
     >>> browser.getLink(url="+delete").click()
     >>> printBugBranchLinks(browser)
     No bug branch links
+
+
+Deleting a branch with linked bugs
+==================================
+
+    >>> login('[e-mail]')
+    >>> grub = factory.makeAnyBranch()
+    >>> new_bug = factory.makeBug()
+    >>> grub_bug_link = grub.linkBug(new_bug, grub.owner)
+    >>> grub_url = canonical_url(grub)
+    >>> logout()
+
+    >>> admin_browser.open(grub_url)
+    >>> admin_browser.getLink('Delete branch').click()
+
+    >>> print find_tag_by_id(admin_browser.contents, 'deletion-items')
+    <ul ...
+    <a href="http://bugs.launchpad.dev/product-name.../+bug/..."
+    class="sprite bug-undecided">Bug #...: generic-string...</a>...
+

=== modified file 'lib/lp/code/templates/branch-delete.pt'
--- lib/lp/code/templates/branch-delete.pt	2009-08-12 00:47:32 +0000
+++ lib/lp/code/templates/branch-delete.pt	2010-02-24 17:14:18 +0000
@@ -24,7 +24,7 @@
 
   <tal:deletelist condition="view/branch_deletion_actions/delete">
     The following items must be <em>deleted</em>:
-    <ul>
+    <ul id="deletion-items">
       <tal:actions repeat="row view/branch_deletion_actions/delete">
         <li>
           <img src="/@@/no" title="Insufficient privileges"