Merge lp:~jelmer/launchpad/no-code-import-approval-2 into lp:launchpad

[Jelmer Vernooij]

[r=gmb][bug=524303] Remove admin button for creating approved imports, and clarify notification about new imports requiring approval.

Two trivial fixes related to code import approvals:

 * Fix an incorrect message about code imports - they're now all automatically approved.
 * Remove the "Create Approved Import" button from the new import page, as it no longer is any different from the "Request Import" button

There didn't appear to be any tests related to either of these.

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/lp/code/browser/codeimport.py'
--- lib/lp/code/browser/codeimport.py	2011-05-27 21:12:25 +0000
+++ lib/lp/code/browser/codeimport.py	2011-08-30 16:58:05 +0000
@@ -424,29 +424,7 @@
         self.next_url = canonical_url(code_import.branch)
 
         self.request.response.addNotification("""
-            New code import created. The code import operators
-            have been notified and the request will be reviewed shortly.""")
-
-    def _showApprove(self, ignored):
-        """Is the user an admin or member of vcs-imports?"""
-        return self._super_user
-
-    @action(_('Create Approved Import'), name='approve',
-            condition=_showApprove)
-    def approve_action(self, action, data):
-        """Create the code_import, and subscribe the user to the branch."""
-        try:
-            code_import = self._create_import(
-                data, CodeImportReviewStatus.REVIEWED)
-        except BranchExists, e:
-            self._setBranchExists(e.existing_branch)
-            return
-
-        # Don't subscribe the requester as they are an import operator.
-        self.next_url = canonical_url(code_import.branch)
-
-        self.request.response.addNotification(
-            "New reviewed code import created.")
+            New code import created. The code import will start shortly.""")
 
     def getProduct(self, data):
         """If the context is a product, use that, otherwise get from data."""

=== modified file 'lib/lp/code/interfaces/codeimport.py'
--- lib/lp/code/interfaces/codeimport.py	2011-02-23 20:26:53 +0000
+++ lib/lp/code/interfaces/codeimport.py	2011-08-30 16:58:05 +0000
@@ -108,9 +108,8 @@
     review_status = exported(
         Choice(
             title=_("Review Status"), vocabulary=CodeImportReviewStatus,
-            default=CodeImportReviewStatus.NEW, readonly=True,
-            description=_("Before a code import is performed, it is reviewed."
-                " Only reviewed imports are processed.")))
+            default=CodeImportReviewStatus.REVIEWED, readonly=True,
+            description=_("Only reviewed imports are processed.")))
 
     rcs_type = exported(
         Choice(title=_("Type of RCS"), readonly=True,

=== modified file 'lib/lp/code/model/codeimport.py'
--- lib/lp/code/model/codeimport.py	2011-08-30 00:09:33 +0000
+++ lib/lp/code/model/codeimport.py	2011-08-30 16:58:05 +0000
@@ -86,7 +86,7 @@
         storm_validator=validate_public_person, notNull=False, default=None)
 
     review_status = EnumCol(schema=CodeImportReviewStatus, notNull=True,
-        default=CodeImportReviewStatus.NEW)
+        default=CodeImportReviewStatus.REVIEWED)
 
     rcs_type = EnumCol(schema=RevisionControlSystems,
         notNull=False, default=None)