Changed the menu listing of review dirs and their display on the Directorates page back to what it was before the 'reviews' group type was split out. Added a 'Reviews' column to the Directoratges page.
- Legacy-Id: 15420
This commit is contained in:
parent
0c732d6538
commit
caa3ec98b4
|
@ -7,7 +7,7 @@ register = template.Library()
|
|||
|
||||
@register.simple_tag
|
||||
def active_groups_menu():
|
||||
parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','review','program'])
|
||||
parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
|
||||
for p in parents:
|
||||
p.menu_url = '/%s/'%p.slug
|
||||
return render_to_string('base/menu_active_groups.html', { 'parents': parents })
|
||||
|
|
|
@ -305,7 +305,7 @@ def active_group_types(request):
|
|||
return render(request, 'group/active_groups.html', {'grouptypes':grouptypes})
|
||||
|
||||
def active_dirs(request):
|
||||
dirs = Group.objects.filter(type="dir", state="active").order_by("name")
|
||||
dirs = Group.objects.filter(type__in=['dir', 'review'], state="active").order_by("name")
|
||||
for group in dirs:
|
||||
group.chairs = sorted(roles(group, "chair"), key=extract_last_name)
|
||||
group.ads = sorted(roles(group, "ad"), key=extract_last_name)
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
<tr>
|
||||
<th>Team</th>
|
||||
<th>Name</th>
|
||||
<th>Reviews</th>
|
||||
<th>Area</th>
|
||||
<th>AD</th>
|
||||
<th>Secretaries</th>
|
||||
|
@ -28,6 +29,11 @@
|
|||
<tr>
|
||||
<td><a href="{% url "ietf.group.views.group_home" acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td>{{ group.name }}</td>
|
||||
<td class="text-center">
|
||||
{% if group.type_id == 'review' %}
|
||||
<span class="fa fa-check tiny"><span class="hidden">yes</span></span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td><a href="{% url "ietf.group.views.group_home" acronym=group.parent.acronym %}">{{ group.parent.acronym }}</a></td>
|
||||
<td>
|
||||
{% for ad in group.ads %}
|
||||
|
|
Loading…
Reference in a new issue