Merge lp:~thumper/launchpad/code-imports-for-products into lp:launchpad

[Tim Penhey]

Have a +new-import view hang off product which doesn't ask for the product name.

[Tim Penhey (thumper)]

When requesting a code import for a known product, you shouldn't be asked to type in the product name again.

stories/codeimport/xx-create-codeimport.txt

[Michael Hudson-Doyle (mwhudson)]

Looks fine! yay.

review: Approve

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2009-11-11 01:53:33 +0000
+++ lib/lp/code/browser/branchlisting.py	2010-01-14 02:09:16 +0000
@@ -1128,7 +1128,7 @@
     def code_import(self):
         text = 'Import your project'
         enabled = not self.context.official_codehosting
-        return Link('/+code-imports/+new', text, icon='add', enabled=enabled)
+        return Link('+new-import', text, icon='add', enabled=enabled)
 
 
 class ProductBranchListingView(BranchListingView):

=== modified file 'lib/lp/code/browser/codeimport.py'
--- lib/lp/code/browser/codeimport.py	2009-12-08 02:32:03 +0000
+++ lib/lp/code/browser/codeimport.py	2010-01-14 02:09:16 +0000
@@ -40,6 +40,7 @@
     ICodeImport, ICodeImportSet)
 from lp.code.interfaces.codeimportmachine import ICodeImportMachineSet
 from lp.code.interfaces.branch import BranchExists, IBranch
+from lp.registry.interfaces.product import IProduct
 from canonical.launchpad.webapp import (
     action, canonical_url, custom_widget, LaunchpadFormView, LaunchpadView,
     Navigation, stepto)
@@ -218,7 +219,6 @@
     """The view to request a new code import."""
 
     for_input = True
-    label = 'Request a code import'
     field_names = [
         'product', 'rcs_type', 'svn_branch_url', 'cvs_root', 'cvs_module',
         'git_repo_url',
@@ -232,12 +232,26 @@
         }
 
     @property
+    def context_is_product(self):
+        return IProduct.providedBy(self.context)
+
+    @property
+    def label(self):
+        if self.context_is_product:
+            return 'Request a code import for %s' % self.context.displayname
+        else:
+            return 'Request a code import'
+
+    @property
     def cancel_url(self):
         """Cancel should take the user back to the root site."""
         return '/'
 
     def setUpFields(self):
         CodeImportBaseView.setUpFields(self)
+        if self.context_is_product:
+            self.form_fields = self.form_fields.omit('product')
+
         # Add in the field for the branch name.
         name_field = form.Fields(
             TextLine(
@@ -270,9 +284,10 @@
 
     def _create_import(self, data, status):
         """Create the code import."""
+        product = self.getProduct(data)
         return getUtility(ICodeImportSet).new(
             registrant=self.user,
-            product=data['product'],
+            product=product,
             branch_name=data['branch_name'],
             rcs_type=data['rcs_type'],
             svn_branch_url=data['svn_branch_url'],
@@ -338,12 +353,19 @@
         self.request.response.addNotification(
             "New reviewed code import created.")
 
+    def getProduct(self, data):
+        """If the context is a product, use that, otherwise get from data."""
+        if self.context_is_product:
+            return self.context
+        else:
+            return data.get('product')
+
     def validate(self, data):
         """See `LaunchpadFormView`."""
         # Make sure that the user is able to create branches for the specified
         # namespace.
         celebs = getUtility(ILaunchpadCelebrities)
-        product = data.get('product')
+        product = self.getProduct(data)
         if product is not None:
             namespace = get_branch_namespace(celebs.vcs_imports, product)
             policy = IBranchNamespacePolicy(namespace)

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2009-12-10 01:33:59 +0000
+++ lib/lp/code/browser/configure.zcml	2010-01-14 02:09:16 +0000
@@ -686,6 +686,12 @@
             name="+new"
             template="../templates/codeimport-new.pt"
             permission="launchpad.AnyPerson"/>
+        <browser:page
+            for="lp.registry.interfaces.product.IProduct"
+            class="lp.code.browser.codeimport.CodeImportNewView"
+            name="+new-import"
+            template="../templates/codeimport-new.pt"
+            permission="launchpad.AnyPerson"/>
     </facet>
     <browser:navigation
         module="lp.code.browser.codeimport"

=== modified file 'lib/lp/code/stories/codeimport/xx-create-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2009-12-08 02:32:03 +0000
+++ lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2010-01-14 02:09:16 +0000
@@ -22,7 +22,12 @@
     >>> browser.getLink('Cancel').click()
     >>> print browser.url
     http://code.launchpad.dev/
-    >>> browser.getLink(id="new-code-import").click()
+
+For projects that don't officially use Launchpad for code, there is also a
+link on the main branch listing page for the product.
+
+    >>> browser.open('http://code.launchpad.dev/firefox')
+    >>> browser.getLink('Import your project').click()
 
 
 Requesting a Subversion import
@@ -38,7 +43,6 @@
 The user is required to enter a project that the import is for,
 a name for the import branch, and a subversion branch location.
 
-    >>> browser.getControl('Project').value = "firefox"
     >>> browser.getControl('Branch Name').value = "imported"
     >>> browser.getControl('Branch URL').value = (
     ...     "http://svn.example.com/firefox/trunk")

=== modified file 'lib/lp/code/templates/codeimport-new.pt'
--- lib/lp/code/templates/codeimport-new.pt	2009-12-08 02:32:03 +0000
+++ lib/lp/code/templates/codeimport-new.pt	2010-01-14 02:09:16 +0000
@@ -30,9 +30,11 @@
 
       <table class="form">
 
-        <tal:widget define="widget nocall:view/widgets/product">
-          <metal:block use-macro="context/@@launchpad_form/widget_row" />
-        </tal:widget>
+        <tal:show-product condition="not: view/context_is_product">
+          <tal:widget define="widget nocall:view/widgets/product">
+            <metal:block use-macro="context/@@launchpad_form/widget_row" />
+          </tal:widget>
+        </tal:show-product>
         <tal:widget define="widget nocall:view/widgets/branch_name">
           <metal:block use-macro="context/@@launchpad_form/widget_row" />
         </tal:widget>