Merge lp:~kfogel/launchpad/534736-patches-portlet-first into lp:launchpad

[Karl Fogel]

Do exactly what the bug says: show patch attachments portlet before non-patch attachments.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt'
--- lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2009-09-04 00:37:37 +0000
+++ lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2010-03-15 16:10:45 +0000
@@ -51,3 +51,23 @@
     >>> link = browser.getLink('sample data')
     >>> print link.url
     http://localhost:58000/.../test.txt
+
+== Patch attachments are shown before non-patch attachments ==
+
+    >>> login("[e-mail]")
+    >>> patch_attachment = bug_11.addAttachment(
+    ...     owner=None, data=StringIO.StringIO('patchy patch patch'),
+    ...     comment=bug_11.initial_message, filename='patch.txt',
+    ...     is_patch=True, content_type='text/plain',
+    ...     description='a patch')
+    >>> syncUpdate(patch_attachment)
+    >>> syncUpdate(bug_11)
+    >>> logout()
+    >>> browser.open("http://bugs.launchpad.dev/redfish/+bug/11")
+    >>> print extract_text(browser.contents)
+    Bug #11 in Jokosher...
+    ...Patches...
+    ...a patch...
+    ...Bug attachments...
+    ...sample data...
+    ... 

=== modified file 'lib/lp/bugs/templates/bug-portlet-attachments.pt'
--- lib/lp/bugs/templates/bug-portlet-attachments.pt	2009-12-10 15:07:18 +0000
+++ lib/lp/bugs/templates/bug-portlet-attachments.pt	2010-03-15 16:10:45 +0000
@@ -3,6 +3,28 @@
     xmlns:metal="http://xml.zope.org/namespaces/metal"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     tal:omit-tag="">
+  <div tal:condition="view/patches" class="portlet" id="portlet-patches">
+    <h2>Patches</h2>
+    <ul>
+      <li class="download-attachment"
+          tal:repeat="attachment view/patches">
+        <a tal:attributes="href attachment/libraryfile/http_url"
+           tal:content="attachment/title"
+           class="sprite haspatch-icon">
+          Attachment Title
+        </a>
+        <small>
+          (<a tal:attributes="href attachment/fmt:url">edit</a>)
+        </small>
+      </li>
+    </ul>
+    <ul>
+      <li>
+        <a tal:attributes="href string:${view/current_bugtask/fmt:url/+addcomment}?field.patch=on"
+           class="sprite add">Add patch</a>
+      </li>
+    </ul>
+  </div>
   <div tal:condition="view/regular_attachments" class="portlet"
        id="portlet-attachments">
     <h2>Bug attachments</h2>
@@ -26,26 +48,4 @@
       </li>
     </ul>
   </div>
-  <div tal:condition="view/patches" class="portlet" id="portlet-patches">
-    <h2>Patches</h2>
-    <ul>
-      <li class="download-attachment"
-          tal:repeat="attachment view/patches">
-        <a tal:attributes="href attachment/libraryfile/http_url"
-           tal:content="attachment/title"
-           class="sprite haspatch-icon">
-          Attachment Title
-        </a>
-        <small>
-          (<a tal:attributes="href attachment/fmt:url">edit</a>)
-        </small>
-      </li>
-    </ul>
-    <ul>
-      <li>
-        <a tal:attributes="href string:${view/current_bugtask/fmt:url/+addcomment}?field.patch=on"
-           class="sprite add">Add patch</a>
-      </li>
-    </ul>
-  </div>
 </div>