Merge lp:~bac/launchpad/bug-638420 into lp:launchpad

[Brad Crittenden]

Enable project configuration progress bars on lpnet.

= Summary =

The roll-out of the progress bar was blocked from lpnet originally as it
wasn't accurate. It should be presented in the 10.10 release.

== Proposed fix ==

Remove the template-based traps that prevented the progress bar and
yes/no indicators from rendering.

The test was changed to demonstrate that the progress bar does show up
in lpnet. But, that test makes no sense going forward so the entire
section was removed.

== Pre-implementation notes ==

None

== Implementation details ==

As above.

== Tests ==

bin/test -vvt pillar-views.txt

== Demo and Q/A ==

Look at project home page (for a project you own) on production and see
the progress bar.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/templates/pillar-involvement-portlet.pt
  lib/lp/registry/browser/tests/pillar-views.txt

[Edwin Grubbs (edwin-grubbs)]

Hi Brad,

This looks good.

-Edwin

review: Approve (code)

=== modified file 'lib/lp/registry/browser/tests/pillar-views.txt'
--- lib/lp/registry/browser/tests/pillar-views.txt	2010-09-10 13:29:42 +0000
+++ lib/lp/registry/browser/tests/pillar-views.txt	2010-09-15 15:41:19 +0000
@@ -153,35 +153,6 @@
     <span class="sprite no">...
     </table>
 
-Until other supporting code lands, the progress bar is not going to be
-shown on lpnet.
-
-    >>> # Pretend that we're on launchpad.net:
-    >>> from canonical.config import config
-    >>> from textwrap import dedent
-    >>> test_data = dedent("""
-    ...     [launchpad]
-    ...     is_lpnet: True
-    ...     """)
-    >>> config.push('test_data', test_data)
-
-The progress bar is not shown on lpnet.
-
-    >>> view = create_view(product, '+get-involved')
-    >>> rendered = view.render()
-    >>> print find_tag_by_id(rendered, 'progressbar')
-    None
-
-Neither are the indicator sprites.
-
-    >>> 'sprite' in find_tag_by_id(rendered, 'configuration_links')
-    False
-
-    >>> # Restore the previous config:
-    >>> config_data = config.pop('test_data')
-    >>> print config.launchpad.is_lpnet
-    False
-
 Project groups are supported too, but they only display the
 applications used by their products.
 
 
=== modified file 'lib/lp/registry/templates/pillar-involvement-portlet.pt'
--- lib/lp/registry/templates/pillar-involvement-portlet.pt	2010-08-04 12:34:28 +0000
+++ lib/lp/registry/templates/pillar-involvement-portlet.pt	2010-09-15 15:41:19 +0000
@@ -3,7 +3,6 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   id="involvement" class="portlet"
   tal:condition="view/has_involvement"
-  tal:define="is_lpnet modules/canonical.config/config/launchpad/is_lpnet;"
   >
   <h2>Get Involved</h2>
 
@@ -35,7 +34,6 @@
   <tal:editor condition="context/required:launchpad.Edit"
               define="registration view/registration_completeness">
 
-    <tal:not_lpnet condition="not:is_lpnet">
     <tal:show_configuration condition="registration">
       <h2>Configuration Progress</h2>
       <div class="centered" id="progressbar">
@@ -54,7 +52,6 @@
           </table>
       </div>
     </tal:show_configuration>
-    </tal:not_lpnet>
 
     <table style="width: 100%; padding-top: 1em"
            tal:condition="view/configuration_links"
@@ -65,11 +62,9 @@
             <a tal:replace="structure link_status/link/fmt:link" />
           </td>
 
-          <tal:not_lpnet condition="not:is_lpnet">
           <td style="text-align: right;" tal:condition="registration">
             <tal:yes-no replace="structure link_status/configured/image:boolean" />
           </td>
-          </tal:not_lpnet>
 
         </tr>
       </tal:item>