diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2010-10-22 14:14:10 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2010-11-01 10:24:04 -0400 |
| commit | ddb04aaac7d9875f1dfd7970944dab6aa6557099 (patch) | |
| tree | 0ee4cc15b728dd228fba03083ff4e81b53e572f2 /templates/patchwork | |
| parent | 3c1fe032cde2289a6ba2f87f09546e646d0e26bb (diff) | |
| download | patchwork-ddb04aaac7d9875f1dfd7970944dab6aa6557099.tar.bz2 patchwork-ddb04aaac7d9875f1dfd7970944dab6aa6557099.tar.xz | |
Add support for git-pull requests
Add a a pull_url to the Patch object, and update the parser to look for
git-pull style emails.
Requires SQL migration script.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'templates/patchwork')
| -rw-r--r-- | templates/patchwork/patch.html | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html index c716a33..b9addc6 100644 --- a/templates/patchwork/patch.html +++ b/templates/patchwork/patch.html @@ -44,9 +44,11 @@ function toggle_headers(link_id, headers_id) <th>Download</th> <td> <a href="{% url patchwork.views.patch.mbox patch_id=patch.id %}" - >mbox</a> | + >mbox</a> +{% if patch.content %}| <a href="{% url patchwork.views.patch.content patch_id=patch.id %}" >patch</a> +{% endif %} </td> </tr> <tr> @@ -202,8 +204,11 @@ function toggle_headers(link_id, headers_id) </div> </div> - - +{% if patch.pull_url %} +<h2>Pull-request</h2> +<a class="patch-pull-url" href="{{patch.pull_url}}" + >{{ patch.pull_url }}</a> +{% endif %} <h2>Comments</h2> {% for comment in patch.comments %} @@ -215,11 +220,14 @@ function toggle_headers(link_id, headers_id) </div> {% endfor %} +{% if patch.content %} <h2>Patch</h2> <div class="patch"> <pre class="content"> {{ patch|patchsyntax }} </pre> </div> +{% endif %} + {% endblock %} |