You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/02/13 16:05:38 UTC
[04/17] git commit: [#7069] ticket:525 added empty check for
downstream_url
[#7069] ticket:525 added empty check for downstream_url
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6e0435cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6e0435cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6e0435cb
Branch: refs/heads/cj/7097
Commit: 6e0435cbd928c14a21cad8cd9a6976511eca4939
Parents: 52ad1f4
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Thu Jan 30 20:28:07 2014 +0200
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue Feb 11 05:13:08 2014 +0000
----------------------------------------------------------------------
Allura/allura/templates/repo/merge_requests.html | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6e0435cb/Allura/allura/templates/repo/merge_requests.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_requests.html b/Allura/allura/templates/repo/merge_requests.html
index 772957c..166be00 100644
--- a/Allura/allura/templates/repo/merge_requests.html
+++ b/Allura/allura/templates/repo/merge_requests.html
@@ -48,7 +48,11 @@
<td><a href="{{req.request_number}}/">{{req.request_number}}</a></td>
<td><a href="{{req.request_number}}/">{{req.status}}</a></td>
<td><a href="{{req.request_number}}/">{{req.summary}}</a></td>
- <td><a href="{{req.downstream_url}}">{{req.downstream_url}}</a></td>
+ <td>{% if req.downstream_url %}
+ <a href="{{req.downstream_url}}">{{req.downstream_url}}</a>
+ {% else %}
+ <i>(deleted)</i>
+ {% endif %}</td>
<td><a href="{{req.creator_url}}">{{req.creator_name}}</a></td>
</tr>
{% endfor %}