Fixed a merge error which replaced the group group state with a duplicate group charter line on the group_about page. Fixes issue #2009.
- Legacy-Id: 11994
This commit is contained in:
parent
f2c31f242b
commit
f01327cba7
|
@ -35,21 +35,14 @@
|
|||
{% endif %}
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td></td>
|
||||
<th>Charter</th>
|
||||
<td>
|
||||
{% if group.charter %}
|
||||
<a href="{% url "doc_view" name=group.charter.name %}">{{ group.charter.name }}-{{ group.charter.rev }}</a>
|
||||
<span class="label label-info">{{ group.charter.get_state.name }}</span>
|
||||
{% else %}
|
||||
(None)
|
||||
{% if user|has_role:"Area Director,Secretariat" %}
|
||||
<a class="btn btn-warning btn-xs" href="{{ charter_submit_url }}">Submit charter</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
<td></td>
|
||||
<th>State</th>
|
||||
<td>
|
||||
{{ group.state.name }}
|
||||
{% if requested_close %}
|
||||
<div class="label label-info">In the process of being closed</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
{% if group.features.has_chartering_process %}
|
||||
<tr>
|
||||
|
|
Loading…
Reference in a new issue