1
=== modified file 'lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt'
2
--- lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2009-09-04 00:37:37 +0000
3
+++ lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt	2010-03-15 16:10:45 +0000
4
@@ -51,3 +51,23 @@
5
51
    >>> link = browser.getLink('sample data')
51
    >>> link = browser.getLink('sample data')
6
52
    >>> print link.url
52
    >>> print link.url
7
53
    http://localhost:58000/.../test.txt
53
    http://localhost:58000/.../test.txt
8
54
9
55
== Patch attachments are shown before non-patch attachments ==
10
56
11
57
    >>> login("test@canonical.com")
12
58
    >>> patch_attachment = bug_11.addAttachment(
13
59
    ...     owner=None, data=StringIO.StringIO('patchy patch patch'),
14
60
    ...     comment=bug_11.initial_message, filename='patch.txt',
15
61
    ...     is_patch=True, content_type='text/plain',
16
62
    ...     description='a patch')
17
63
    >>> syncUpdate(patch_attachment)
18
64
    >>> syncUpdate(bug_11)
19
65
    >>> logout()
20
66
    >>> browser.open("http://bugs.launchpad.dev/redfish/+bug/11")
21
67
    >>> print extract_text(browser.contents)
22
68
    Bug #11 in Jokosher...
23
69
    ...Patches...
24
70
    ...a patch...
25
71
    ...Bug attachments...
26
72
    ...sample data...
27
73
    ... 
28
54
74
29
=== modified file 'lib/lp/bugs/templates/bug-portlet-attachments.pt'
30
--- lib/lp/bugs/templates/bug-portlet-attachments.pt	2009-12-10 15:07:18 +0000
31
+++ lib/lp/bugs/templates/bug-portlet-attachments.pt	2010-03-15 16:10:45 +0000
32
@@ -3,6 +3,28 @@
33
3
    xmlns:metal="http://xml.zope.org/namespaces/metal"
3
    xmlns:metal="http://xml.zope.org/namespaces/metal"
34
4
    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
4
    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
35
5
    tal:omit-tag="">
5
    tal:omit-tag="">
36
6
  <div tal:condition="view/patches" class="portlet" id="portlet-patches">
37
7
    <h2>Patches</h2>
38
8
    <ul>
39
9
      <li class="download-attachment"
40
10
          tal:repeat="attachment view/patches">
41
11
        <a tal:attributes="href attachment/libraryfile/http_url"
42
12
           tal:content="attachment/title"
43
13
           class="sprite haspatch-icon">
44
14
          Attachment Title
45
15
        </a>
46
16
        <small>
47
17
          (<a tal:attributes="href attachment/fmt:url">edit</a>)
48
18
        </small>
49
19
      </li>
50
20
    </ul>
51
21
    <ul>
52
22
      <li>
53
23
        <a tal:attributes="href string:${view/current_bugtask/fmt:url/+addcomment}?field.patch=on"
54
24
           class="sprite add">Add patch</a>
55
25
      </li>
56
26
    </ul>
57
27
  </div>
58
6
  <div tal:condition="view/regular_attachments" class="portlet"
28
  <div tal:condition="view/regular_attachments" class="portlet"
59
7
       id="portlet-attachments">
29
       id="portlet-attachments">
60
8
    <h2>Bug attachments</h2>
30
    <h2>Bug attachments</h2>
61
@@ -26,26 +48,4 @@
62
26
      </li>
48
      </li>
63
27
    </ul>
49
    </ul>
64
28
  </div>
50
  </div>
65
29
  <div tal:condition="view/patches" class="portlet" id="portlet-patches">
66
30
    <h2>Patches</h2>
67
31
    <ul>
68
32
      <li class="download-attachment"
69
33
          tal:repeat="attachment view/patches">
70
34
        <a tal:attributes="href attachment/libraryfile/http_url"
71
35
           tal:content="attachment/title"
72
36
           class="sprite haspatch-icon">
73
37
          Attachment Title
74
38
        </a>
75
39
        <small>
76
40
          (<a tal:attributes="href attachment/fmt:url">edit</a>)
77
41
        </small>
78
42
      </li>
79
43
    </ul>
80
44
    <ul>
81
45
      <li>
82
46
        <a tal:attributes="href string:${view/current_bugtask/fmt:url/+addcomment}?field.patch=on"
83
47
           class="sprite add">Add patch</a>
84
48
      </li>
85
49
    </ul>
86
50
  </div>
87
51
</div>
51
</div>
Reviewer	Review Type	Date Requested	Status
Abel Deuring (community)	code	2010-03-15	Approve on 2010-03-15
Review via email: mp+21377@code.launchpad.net