Merge lp:~bac/launchpad/bug-407604-proj-desc into lp:launchpad

[Brad Crittenden]

Fix a bug where the product description is not set when creating a new product.

[Brad Crittenden (bac)]

= Summary =

During project registration the user enters a project description but we then fail to
use it, requiring the data to be entered again on another page. Very annoying for
our users.

== Proposed fix ==

Use the data!

== Pre-implementation notes ==

None

== Implementation details ==

As above.

Note the original test had the setting of the description wrong in that it started
with '...' not '>>>' which silently fails. Argh. Took me an hour to find that.
Wouldn't have mattered, though, as it wasn't being checked.

== Tests ==

bin/test -vvt xx-product-add.txt

== Demo and Q/A ==

Create a project. Add a description. See that it appears on the overview page.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/browser/product.py
  lib/lp/registry/stories/product/xx-product-add.txt

== Pylint notices ==

lib/lp/registry/browser/product.py
    54: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

[Guilherme Salgado (salgado)]

Hi Brad,

9 project = data.get('project', None)
10 + description = data.get('description', None)

I'd just use "data.get('foo')" above as None is the default of dict.get() anyway.

review: Approve (code)

[Brad Crittenden (bac)]

Thanks for the review Salgado. Your change was made.

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-01-07 04:59:44 +0000
+++ lib/lp/registry/browser/product.py	2010-01-12 00:34:12 +0000
@@ -1678,13 +1678,16 @@
 
     def create_product(self, data):
         """Create the product from the user data."""
-        project = data.get('project', None)
+        # Get optional data.
+        project = data.get('project')
+        description = data.get('description')
         return getUtility(IProductSet).createProduct(
             owner=self.user,
             name=data['name'],
+            displayname=data['displayname'],
             title=data['title'],
             summary=data['summary'],
-            displayname=data['displayname'],
+            description=description,
             licenses=data['licenses'],
             license_info=data['license_info'],
             project=project

=== modified file 'lib/lp/registry/stories/product/xx-product-add.txt'
--- lib/lp/registry/stories/product/xx-product-add.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/registry/stories/product/xx-product-add.txt	2010-01-12 00:34:12 +0000
@@ -87,7 +87,7 @@
     >>> user_browser.getControl('Title').value = 'Aardvark Central Command'
     >>> user_browser.getControl('Summary').value = (
     ...     'Control pesky aardvarkian fnords')
-    ... user_browser.getControl('Description').value = (
+    >>> user_browser.getControl('Description').value = (
     ...     'The desktop aardvark is an ornery thing.')
 
 Before a project can be created though, a license for it must be selected.
@@ -106,6 +106,17 @@
     >>> print user_browser.title
     Aardvark Central Command in Launchpad
 
+Let's ensure the summary and description are presented.
+
+    >>> summary = find_tags_by_class(user_browser.contents,
+    ...                              'summary', only_first=True)
+    >>> print extract_text(summary)
+    Control pesky aardvarkian fnords
+    >>> desc = find_tags_by_class(user_browser.contents,
+    ...                           'description', only_first=True)
+    >>> print extract_text(desc)
+    The desktop aardvark is an ornery thing.
+
 
 Search results
 --------------