Skip to content

Commit 065660b

Browse files
committed
Replace the gigantic incumbent email drop-down in the NomCom tool with an
AutocompletedEmailField, also show the name of the incumbents and not just their email addresses on the list page - Legacy-Id: 8281
1 parent 7b36280 commit 065660b

4 files changed

Lines changed: 17 additions & 1 deletion

File tree

ietf/nomcom/forms.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
get_user_email, validate_private_key, validate_public_key,
1818
get_or_create_nominee, create_feedback_email)
1919
from ietf.person.models import Email
20+
from ietf.person.fields import AutocompletedEmailField
2021
from ietf.utils.fields import MultiEmailField
2122
from ietf.utils.mail import send_mail
2223

@@ -655,6 +656,8 @@ class PositionForm(BaseNomcomForm, forms.ModelForm):
655656
fieldsets = [('Position', ('name', 'description',
656657
'is_open', 'incumbent'))]
657658

659+
incumbent = AutocompletedEmailField(required=False)
660+
658661
class Meta:
659662
model = Position
660663
fields = ('name', 'description', 'is_open', 'incumbent')

ietf/templates/nomcom/edit_position.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{% extends "nomcom/nomcom_private_base.html" %}
22

3+
{% block pagehead %}
4+
<link rel="stylesheet" type="text/css" href="/css/token-input.css"></link>
5+
{% endblock %}
6+
7+
{% block content_end %}
8+
<script type="text/javascript" src="/js/lib/jquery.tokeninput.js"></script>
9+
<script type="text/javascript" src="/js/tokenized-field.js"></script>
10+
{% endblock %}
11+
312
{% block nomcom_content %}
413
<h3>{% if position %}Edit{% else %}Add{% endif %} position</h3>
514

ietf/templates/nomcom/list_positions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h3>{{ position.name }} <a href="{% url "nomcom_edit_position" year position.id
1111
<dt>Description:</dt>
1212
<dd>{{ position.description }}</dd>
1313
<dt>Incumbent:</dt>
14-
<dd>{{ position.incumbent }}</dd>
14+
<dd>{% if position.incumbent %}{{ position.incumbent.person }} &lt;{{ position.incumbent.address }}&gt;{% else %}None{% endif %}</dd>
1515
<dt>Is open:</dt>
1616
<dd>{{ position.is_open }}</dd>
1717
<dt>Templates:</dt>

static/css/base2.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,10 @@ div.info-message-error { border: 1px solid red; background-color: #ffeebb; paddi
308308
margin-left: 150px;
309309
}
310310

311+
.baseform .fieldWidget ul.token-input-list {
312+
clear: none;
313+
}
314+
311315
#feedbackformset .fieldWidget {
312316
margin-left: 0px;
313317
}

0 commit comments

Comments
 (0)