Merge lp:~rockstar/launchpad/pedantry-round2 into lp:launchpad

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi there-

  This branch fixes bug #465247 - Basically, I just needed to move the "Edit
import" back into the page (as opposed to the navigation menu). Technically,
this shouldn't break any tests, but I'll obviously run it through ec2 and have
it land it for me.

Cheers,
Paul

[Edwin Grubbs (edwin-grubbs)]

Hi Paul,

Looks good.

merge-approved

-Edwin

review: Approve (code)

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2010-01-20 03:37:27 +0000
+++ lib/lp/code/browser/branch.py	2010-01-21 08:40:27 +0000
@@ -188,7 +188,7 @@
     facet = 'branches'
     title = 'Edit branch'
     links = (
-        'edit', 'reviewer', 'edit_import', 'edit_whiteboard', 'delete')
+        'edit', 'reviewer', 'edit_whiteboard', 'delete')
 
     def branch_is_import(self):
         return self.context.branch_type == BranchType.IMPORTED
@@ -210,14 +210,6 @@
         return Link(
             '+whiteboard', text, icon='edit', enabled=enabled)
 
-    def edit_import(self):
-        text = 'Edit import source or review import'
-        enabled = (
-            self.branch_is_import() and
-            check_permission('launchpad.Edit', self.context.code_import))
-        return Link(
-            '+edit-import', text, icon='edit', enabled=enabled)
-
     @enabled_with_permission('launchpad.Edit')
     def reviewer(self):
         text = 'Set branch reviewer'
@@ -232,7 +224,7 @@
     links = [
         'add_subscriber', 'browse_revisions', 'link_bug',
         'link_blueprint', 'register_merge', 'source', 'subscription',
-        'edit_status', 'upgrade_branch']
+        'edit_status', 'edit_import', 'upgrade_branch']
 
     @enabled_with_permission('launchpad.Edit')
     def edit_status(self):
@@ -299,6 +291,15 @@
         url = self.context.codebrowse_url('files')
         return Link(url, text, icon='info', enabled=enabled)
 
+    def edit_import(self):
+        text = 'Edit import source or review import'
+        enabled = True
+        enabled = (
+            self.context.branch_type == BranchType.IMPORTED and
+            check_permission('launchpad.Edit', self.context.code_import))
+        return Link(
+            '+edit-import', text, icon='edit', enabled=enabled)
+
     @enabled_with_permission('launchpad.Edit')
     def upgrade_branch(self):
         enabled = False

=== modified file 'lib/lp/code/stories/codeimport/xx-admin-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-admin-codeimport.txt	2009-12-08 04:31:34 +0000
+++ lib/lp/code/stories/codeimport/xx-admin-codeimport.txt	2010-01-21 08:40:27 +0000
@@ -53,6 +53,7 @@
     Import Status: Pending Review
     This branch is an import of the Subversion branch
     from svn://svn.example.com/fooix/trunk.
+    Edit import source or review import
 
 
 Editing details
@@ -157,6 +158,7 @@
     Import Status: Reviewed
     ...
     The next import is scheduled to run as soon as possible.
+    Edit import source or review import
 
     >>> for message in get_feedback_messages(import_browser.contents):
     ...     print extract_text(message)
@@ -214,6 +216,7 @@
     Import Status: Reviewed
     ...
     The next import is scheduled to run as soon as possible.
+    Edit import source or review import
 
 Now set the job as running.
 
@@ -242,6 +245,7 @@
     ago.  The last few lines of the job's output were:
         Changeset 1
         Changeset 2
+    Edit import source or review import
 
 
 Import details for a import that has been imported successfully

=== modified file 'lib/lp/code/templates/branch-import-details.pt'
--- lib/lp/code/templates/branch-import-details.pt	2009-12-08 22:40:31 +0000
+++ lib/lp/code/templates/branch-import-details.pt	2010-01-21 08:40:27 +0000
@@ -130,6 +130,17 @@
           </tal:result>
         </div>
 
+        <div class="actions">
+          <div
+            tal:define="link context_menu/edit_import"
+            tal:condition="link/enabled"
+            >
+            <a id="linkbug"
+               class="sprite add"
+               tal:attributes="href link/url"
+               tal:content="link/text" />
+          </div>
+        </div>
       </tal:has-codeimport>
     </div>
   </tal:imported-branch>