Merge branch 'fix-merge-type' into pu

This commit is contained in:
Kevin Morris 2021-10-07 23:21:28 -07:00
commit 4b95ec41ed
No known key found for this signature in database
GPG key ID: F7E46DED420788F3

View file

@ -20,7 +20,13 @@
{{ request.PackageBase.Name }}
</a>
</td>
<td>{{ request.RequestType.name_display() | tr }}</td>
<td>
{{ request.RequestType.name_display() | tr }}
{# If the RequestType is a merge and request.MergeBaseName is valid... #}
{% if request.RequestType.ID == 3 and request.MergeBaseName %}
({{ request.MergeBaseName }})
{% endif %}
</td>
<td class="wrap">{{ request.Comments }}</td>
<td>
<a href="/account/{{ request.User.Username }}"