Since the branch scanner is busy, here is the diff http://pastebin.ubuntu.com/427084:
=== modified file 'lib/lp/registry/browser/product.py' --- lib/lp/registry/browser/product.py 2010-04-27 13:57:18 +0000 +++ lib/lp/registry/browser/product.py 2010-05-03 14:23:16 +0000 @@ -1070,7 +1070,7 @@ """Are there packages, or can packages be suggested.""" if len(self.sourcepackages) > 0: return True - if self.user is None or config.launchpad.is_lpnet: + if self.user is None: return False date_next_suggest_packaging = self.context.date_next_suggest_packaging return (
=== modified file 'lib/lp/registry/browser/tests/product-portlet-packages-view.txt' --- lib/lp/registry/browser/tests/product-portlet-packages-view.txt 2010-04-27 13:57:18 +0000 +++ lib/lp/registry/browser/tests/product-portlet-packages-view.txt 2010-05-03 14:38:35 +0000 @@ -225,44 +225,6 @@ >>> view.can_show_portlet False
-The can_show_portlet property indicates that the portlet can be rendered. The -portlet is not rendered if there are no source packages and the environment -is lpnet. - - >>> config.launchpad.is_lpnet - False - - >>> login_person(product.owner) - >>> view = create_initialized_view( - ... product, name="+portlet-packages", principal=product.owner) - >>> view.sourcepackages - [] - - >>> view.can_show_portlet - True - - >>> print extract_text(view.render()) - All packages - Packages in Ubuntu ... - - >>> test_data = """ - ... [launchpad] - ... is_lpnet: True - ... """ - >>> config.push('test_data', test_data) - >>> config.launchpad.is_lpnet - True - - >>> view = create_initialized_view( - ... product, name="+portlet-packages", principal=product.owner) - >>> view.can_show_portlet - False - - >>> print extract_text(view.render()) - <BLANKLINE> - - >>> ignore = config.pop('test_data') - The can_show_portlet property is False when product.date_next_suggest_packaging is None or the date is more than one year ago. @@ -273,6 +235,7 @@ >>> print product.date_next_suggest_packaging None
+ >>> login_person(product.owner) >>> view = create_initialized_view( ... product, name="+portlet-packages", principal=product.owner) >>> view.can_show_portlet
« Back to merge proposal
Since the branch scanner is busy, here is the diff http:// pastebin. ubuntu. com/427084:
=== modified file 'lib/lp/ registry/ browser/ product. py' registry/ browser/ product. py 2010-04-27 13:57:18 +0000 registry/ browser/ product. py 2010-05-03 14:23:16 +0000 sourcepackages) > 0: launchpad. is_lpnet:
date_ next_suggest_ packaging = self.context. date_next_ suggest_ packaging
--- lib/lp/
+++ lib/lp/
@@ -1070,7 +1070,7 @@
"""Are there packages, or can packages be suggested."""
if len(self.
return True
- if self.user is None or config.
+ if self.user is None:
return False
return (
=== modified file 'lib/lp/ registry/ browser/ tests/product- portlet- packages- view.txt' registry/ browser/ tests/product- portlet- packages- view.txt 2010-04-27 13:57:18 +0000 registry/ browser/ tests/product- portlet- packages- view.txt 2010-05-03 14:38:35 +0000 show_portlet
--- lib/lp/
+++ lib/lp/
@@ -225,44 +225,6 @@
>>> view.can_
False
-The can_show_portlet property indicates that the portlet can be rendered. The launchpad. is_lpnet product. owner) initialized_ view( portlet- packages" , principal= product. owner) show_portlet text(view. render( )) push('test_ data', test_data) launchpad. is_lpnet initialized_ view( portlet- packages" , principal= product. owner) show_portlet text(view. render( )) pop('test_ data') date_next_ suggest_ packaging is None or the date is more than one date_next_ suggest_ packaging
-portlet is not rendered if there are no source packages and the environment
-is lpnet.
-
- >>> config.
- False
-
- >>> login_person(
- >>> view = create_
- ... product, name="+
- >>> view.sourcepackages
- []
-
- >>> view.can_
- True
-
- >>> print extract_
- All packages
- Packages in Ubuntu ...
-
- >>> test_data = """
- ... [launchpad]
- ... is_lpnet: True
- ... """
- >>> config.
- >>> config.
- True
-
- >>> view = create_
- ... product, name="+
- >>> view.can_
- False
-
- >>> print extract_
- <BLANKLINE>
-
- >>> ignore = config.
-
The can_show_portlet property is False when
product.
year ago.
@@ -273,6 +235,7 @@
>>> print product.
None
+ >>> login_person( product. owner) initialized_ view( portlet- packages" , principal= product. owner) show_portlet
>>> view = create_
... product, name="+
>>> view.can_