← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~stevenk/launchpad/no-recipe-no-link into lp:launchpad

 

Steve Kowalik has proposed merging lp:~stevenk/launchpad/no-recipe-no-link into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/no-recipe-no-link/+merge/66353

The branch page currently contains a comment of "No recipes using this branch" -- where 'No recipes' is a link. This takes you to a page which contains an table with a header, which is pointless. I have also removed the doctest that exercised this code.
-- 
https://code.launchpad.net/~stevenk/launchpad/no-recipe-no-link/+merge/66353
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/no-recipe-no-link into lp:launchpad.
=== modified file 'lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt'
--- lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2011-05-17 12:59:37 +0000
+++ lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2011-06-29 16:53:43 +0000
@@ -28,15 +28,6 @@
     >>> nopriv_browser = setupBrowser(
     ...     auth='Basic nopriv@xxxxxxxxxxxxx:test')
 
-There should be a link on the branch page that says "No recipes" that leads to
-the recipe listings page.
-
-The link to the source package recipe listings should not be shown.
-
-    >>> nopriv_browser.open(recipeless_branch_url)
-    >>> print nopriv_browser.getLink('No recipes').url
-    http://code.launchpad.dev/%7Eperson-name.../product-name.../branch.../+recipes
-
 Create a new sample branch, but this time create some source package branches
 to go along with them.
 

=== modified file 'lib/lp/code/templates/branch-recipes.pt'
--- lib/lp/code/templates/branch-recipes.pt	2011-04-11 01:30:37 +0000
+++ lib/lp/code/templates/branch-recipes.pt	2011-06-29 16:53:43 +0000
@@ -10,9 +10,14 @@
   <div id="recipe-links" class="actions">
     <div id="recipe-summary">
       <img src="/@@/source-package-recipe" />
-      <a href="+recipes" tal:content="structure view/recipe_count_text">
-        1 branch
-      </a>
+      <tal:no-recipes condition="not: view/context/recipes/count">
+      No recipes
+      </tal:no-recipes>
+      <tal:recipes condition="view/context/recipes/count">
+        <a href="+recipes" tal:content="structure view/recipe_count_text">
+          1 branch
+        </a>
+      </tal:recipes>
       using this branch.
 
       <a href="/+help/related-recipes.html" target="help" class="sprite maybe">