Merge lp:~thumper/launchpad/new-code-import-owner into lp:launchpad

[Tim Penhey]

Allow the user to select the owner for a new code import.

Add the ability for the user to specify the owner for a new import branch.

Admins and bzr-experts can specify any branch owner, other people only get to choose from teams that they are a member of or themselves.

[Paul Hummer (rockstar)]

review: Approve (code)

=== modified file 'lib/lp/code/browser/codeimport.py'
--- lib/lp/code/browser/codeimport.py	2010-03-18 17:30:14 +0000
+++ lib/lp/code/browser/codeimport.py	2010-04-23 01:24:23 +0000
@@ -38,7 +38,8 @@
 from lp.code.interfaces.codeimport import (
     ICodeImport, ICodeImportSet)
 from lp.code.interfaces.codeimportmachine import ICodeImportMachineSet
-from lp.code.interfaces.branch import BranchExists, IBranch
+from lp.code.interfaces.branch import (
+    BranchExists, IBranch, user_has_special_branch_access)
 from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.registry.interfaces.product import IProduct
 from canonical.launchpad.webapp import (
@@ -202,6 +203,7 @@
 class NewCodeImportForm(Interface):
     """The fields presented on the form for editing a code import."""
 
+    use_template(IBranch, ['owner'])
     use_template(
         ICodeImport,
         ['rcs_type', 'cvs_root', 'cvs_module'])
@@ -266,10 +268,13 @@
 
     custom_widget('rcs_type', LaunchpadRadioWidget)
 
-    initial_values = {
-        'rcs_type': RevisionControlSystems.BZR_SVN,
-        'branch_name': 'trunk',
-        }
+    @property
+    def initial_values(self):
+        return {
+            'owner': self.user,
+            'rcs_type': RevisionControlSystems.BZR_SVN,
+            'branch_name': 'trunk',
+            }
 
     @property
     def context_is_product(self):
@@ -292,6 +297,21 @@
         if self.context_is_product:
             self.form_fields = self.form_fields.omit('product')
 
+        # If the user can administer branches, then they should be able to
+        # assign the ownership of the branch to any valid person or team.
+        if user_has_special_branch_access(self.user):
+            owner_field = self.schema['owner']
+            any_owner_choice = Choice(
+                __name__='owner', title=owner_field.title,
+                description = _("As an administrator you are able to reassign"
+                                " this branch to any person or team."),
+                required=True, vocabulary='ValidPersonOrTeam')
+            any_owner_field = form.Fields(
+                any_owner_choice, render_context=self.render_context)
+            # Replace the normal owner field with a more permissive vocab.
+            self.form_fields = self.form_fields.omit('owner')
+            self.form_fields = any_owner_field + self.form_fields
+
     def setUpWidgets(self):
         CodeImportBaseView.setUpWidgets(self)
 
@@ -334,6 +354,7 @@
         cvs_root, cvs_module, url = self._getImportLocation(data)
         return getUtility(ICodeImportSet).new(
             registrant=self.user,
+            owner=data['owner'],
             target=IBranchTarget(product),
             branch_name=data['branch_name'],
             rcs_type=data['rcs_type'],
@@ -410,12 +431,13 @@
         """See `LaunchpadFormView`."""
         # Make sure that the user is able to create branches for the specified
         # namespace.
-        celebs = getUtility(ILaunchpadCelebrities)
         product = self.getProduct(data)
-        if product is not None:
-            namespace = get_branch_namespace(celebs.vcs_imports, product)
+        # 'owner' in data may be None if it failed validation.
+        owner = data.get('owner')
+        if product is not None and owner is not None:
+            namespace = get_branch_namespace(owner, product)
             policy = IBranchNamespacePolicy(namespace)
-            if not policy.canCreateBranches(celebs.vcs_imports):
+            if not policy.canCreateBranches(self.user):
                 self.setFieldError(
                     'product',
                     "You are not allowed to register imports for %s."

=== modified file 'lib/lp/code/stories/codeimport/xx-create-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2010-01-20 03:19:44 +0000
+++ lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2010-04-23 01:24:23 +0000
@@ -247,3 +247,45 @@
     ...     print extract_text(message)
     There is 1 error.
     Invalid value
+
+
+Specifying the owner of the branch when it is being created
+===========================================================
+
+When a user is requesting a new code import, they are the owner of the new
+import branch.  sometimes the user may wish for the import branch to be owned
+by a team rather than just themselves.  There is a drop down choice shown for
+the user for the teams that they are a member of.
+
+    >>> sample_browser = setupBrowser(auth='Basic [e-mail]:test')
+    >>> sample_browser.open("http://code.launchpad.dev/firefox/+new-import")
+    >>> sample_browser.getControl('Owner').displayValue
+    ['Sample Person (name12)']
+
+Change the owner to be a team that sample person is a member of.
+
+    >>> sample_browser.getControl('Owner').value = ['landscape-developers']
+    >>> sample_browser.getControl('Owner').displayValue
+    ['Landscape Developers (landscape-developers)']
+    >>> sample_browser.getControl('Branch URL').value = (
+    ...     "http://svn.example.com/firefox-beta/trunk")
+    >>> sample_browser.getControl('Request Import').click()
+
+    >>> print_tag_with_id(sample_browser.contents, 'registration')
+    Created by Sample Person ...
+    >>> print_tag_with_id(sample_browser.contents, 'owner')
+    Owner: Landscape Developers
+
+Admins can specify any owner for a new code import.
+
+    >>> admin_browser = setupBrowser(auth='Basic [e-mail]:test')
+    >>> admin_browser.open("http://code.launchpad.dev/firefox/+new-import")
+    >>> admin_browser.getControl('Owner').value = 'mark'
+    >>> admin_browser.getControl('Branch URL').value = (
+    ...     "http://svn.example.com/firefox-theta/trunk")
+    >>> admin_browser.getControl('Request Import').click()
+
+    >>> print_tag_with_id(admin_browser.contents, 'registration')
+    Created by Foo Bar ...
+    >>> print_tag_with_id(admin_browser.contents, 'owner')
+    Owner: Mark Shuttleworth

=== modified file 'lib/lp/code/templates/codeimport-new.pt'
--- lib/lp/code/templates/codeimport-new.pt	2010-01-20 03:19:44 +0000
+++ lib/lp/code/templates/codeimport-new.pt	2010-04-23 01:24:23 +0000
@@ -30,6 +30,9 @@
 
       <table class="form">
 
+        <tal:widget define="widget nocall:view/widgets/owner">
+          <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" />