Merge lp:~wallyworld/launchpad/mp-link-not-visible into lp:launchpad

[Ian Booth]

[r=bac][ui=none][bug=687703] Always show Register Merge Proposal link on branch page even if user is not logged in. They will be prompted to log in if required.

= Summary =

Small fix to always show the Propose for Merging link on the branch page even if the user is not logged in.
They will just be prompted to login before being redirected to the right place. This is how other similar
links on that page work eg Link to Bug

= Implementation =

Remove @enabled_with_permission('launchpad.AnyPerson') decorator from register_merge()

= Tests =

Added to xx-propose-for-merging doc test to check link is there even if not logged in.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/code/browser/branch.py
  lib/lp/code/stories/branches/xx-propose-for-merging.txt

[Brad Crittenden (bac)]

Hi Ian,

Looks good except for

s/there is if there/there if there/

review: Approve (code)

[Ian Booth (wallyworld)]

> Hi Ian,
>
> Looks good except for
>
> s/there is if there/there if there/

Argh, fixed.

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2010-12-14 20:29:52 +0000
+++ lib/lp/code/browser/branch.py	2010-12-20 10:28:33 +0000
@@ -331,7 +331,6 @@
         text = 'Subscribe someone else'
         return Link('+addsubscriber', text, icon='add')
 
-    @enabled_with_permission('launchpad.AnyPerson')
     def register_merge(self):
         text = 'Propose for merging'
         enabled = (

=== modified file 'lib/lp/code/stories/branches/xx-branchmergeproposals.txt'
--- lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2010-10-25 05:33:20 +0000
+++ lib/lp/code/stories/branches/xx-branchmergeproposals.txt	2010-12-20 10:28:33 +0000
@@ -47,16 +47,7 @@
 Registering a merge proposal
 ----------------------------
 
-Users who are not logged on do not see the link to register.
-
-    >>> anon_browser.open(
-    ...     'http://code.launchpad.dev/~name12/gnome-terminal/klingon')
-    >>> anon_browser.getLink('Propose for merging')
-    Traceback (most recent call last):
-    ...
-    LinkNotFoundError
-
-Logged in users can.
+Logged in users can register a merge proposal.
 
     >>> nopriv_browser = setupBrowser(auth="Basic [e-mail]:test")
     >>> nopriv_browser.open(

=== modified file 'lib/lp/code/stories/branches/xx-propose-for-merging.txt'
--- lib/lp/code/stories/branches/xx-propose-for-merging.txt	2010-03-15 20:28:52 +0000
+++ lib/lp/code/stories/branches/xx-propose-for-merging.txt	2010-12-20 10:28:33 +0000
@@ -8,6 +8,14 @@
     >>> url = canonical_url(branch)
     >>> logout()
 
+The Propose for merging link should be there even if there is no logged in
+user.
+
+    >>> browser = setupBrowser()
+    >>> browser.open(url)
+    >>> browser.getLink('Propose for merging')
+    <Link text='Propose for merging' ...
+
 When proposing a branch for merging, the minimum that is needed is a target
 branch.