Skip to content

Commit 089f23f

Browse files
committed
Added ordering to Role, and a roles section at the top of the personal profile page.
- Legacy-Id: 12931
1 parent 5928bd9 commit 089f23f

2 files changed

Lines changed: 30 additions & 2 deletions

File tree

ietf/group/models.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@ def formatted_ascii_email(self):
270270
def formatted_email(self):
271271
return formataddr((self.person.plain_name(), self.email.address))
272272

273+
class Meta:
274+
ordering = ['name_id', ]
275+
273276
class RoleHistory(models.Model):
274277
# RoleHistory doesn't have a time field as it's not supposed to be
275278
# used on its own - there should always be a GroupHistory

ietf/templates/person/profile.html

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,33 @@ <h1>{{ person.name }} {% if person.ascii != person.name %}<br><small>({{person.a
3333
</div>
3434
</div>
3535

36+
<div class="col-md-12">
37+
<h2 id="roles">Roles</h2>
38+
{% if person.role_set.exists %}
39+
<table class="table">
40+
{% for role in person.role_set.all %}
41+
{% if role.group.state_id == 'active' or role.group.state_id == 'bof' %}
42+
{% if role.group.acronym != 'secretariat' %}
43+
<tr>
44+
<td>
45+
{{ role.name.name }}
46+
{% if role.group.type_id == 'sdo' %}for{% elif role.name_id == 'reviewer' %}in{% else %}of{% endif %}
47+
<a href="{% url 'ietf.group.views.group_about' acronym=role.group.acronym %}">{{ role.group.name }}</a>
48+
(<a href="{% url 'ietf.group.views.group_about' acronym=role.group.acronym %}">{{ role.group.acronym }}</a>)
49+
</td>
50+
<td>
51+
<a href="mailto:{{role.email.address}}">{{ role.email.address }}</a>
52+
</td>
53+
</tr>
54+
{% endif %}
55+
{% endif %}
56+
{% endfor %}
57+
</table>
58+
{% endif %}
59+
</div>
60+
3661
<div class="col-md-6">
37-
<h2>RFCs</h2>
62+
<h2 id="rfcs">RFCs</h2>
3863
{% if person.rfcs %}
3964
<table class="table">
4065
{% for doc in person.rfcs %}
@@ -50,7 +75,7 @@ <h2>RFCs</h2>
5075
{% endif %}
5176
</div>
5277
<div class="col-md-6">
53-
<h2>Active Drafts</h2>
78+
<h2 id="drafts">Active Drafts</h2>
5479
{% if person.active_drafts.exists %}
5580
<list>
5681
{% for doc in person.active_drafts %}

0 commit comments

Comments
 (0)