Skip to content

Commit 868a82a

Browse files
ejimenezejimenez
committed
Change message when public key does not exists
Refactor context views Add new templatetags to check if the nomcom has public key Fixes ietf-tools#1030 - Legacy-Id: 5710
1 parent 3d747db commit 868a82a

10 files changed

Lines changed: 41 additions & 25 deletions

‎ietf/nomcom/forms.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ def __call__(self, request, *args, **kwargs):
133133
group = get_group_or_404(year)
134134
self.state['group'] = group
135135
self.state['rolodex_url'] = ROLODEX_URL
136+
groups = group.nomcom_set.all()
137+
self.nomcom = groups and groups[0] or None
136138
self.group = group
137139
self.year = year
138140

@@ -146,6 +148,7 @@ def preview_get(self, request):
146148
'stage_field': self.unused_name('stage'),
147149
'state': self.state,
148150
'year': self.year,
151+
'nomcom': self.nomcom,
149152
'selected': 'edit_members'},
150153
context_instance=RequestContext(request))
151154

‎ietf/nomcom/templatetags/nomcom_tags.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ def is_chair(user, year):
2626
return nomcom.group.is_chair(user)
2727

2828

29+
@register.filter
30+
def has_publickey(nomcom):
31+
return nomcom and nomcom.public_key and True or False
32+
33+
2934
@register.simple_tag
3035
def add_num_nominations(user, position, nominee):
3136
author = get_user_email(user)

‎ietf/nomcom/views.py‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ def send_reminder_mail(request, year):
156156
'year': year,
157157
'nominees': nominees,
158158
'mail_template': mail_template,
159+
'selected': 'send_reminder_mail',
159160
'message': message}, RequestContext(request))
160161

161162

@@ -218,10 +219,9 @@ def nominate(request, year, public):
218219
template = 'nomcom/private_nominate.html'
219220

220221
if not has_publickey:
221-
message = ('warning', "Nomcom don't have public key to ecrypt data, please contact with nomcom chair")
222+
message = ('warning', "This Nomcom is not yet accepting nominations")
222223
return render_to_response(template,
223-
{'has_publickey': has_publickey,
224-
'message': message,
224+
{'message': message,
225225
'nomcom': nomcom,
226226
'year': year,
227227
'selected': 'nominate'}, RequestContext(request))
@@ -236,8 +236,7 @@ def nominate(request, year, public):
236236
form = NominateForm(nomcom=nomcom, user=request.user, public=public)
237237

238238
return render_to_response(template,
239-
{'has_publickey': has_publickey,
240-
'form': form,
239+
{'form': form,
241240
'message': message,
242241
'nomcom': nomcom,
243242
'year': year,
@@ -275,10 +274,9 @@ def feedback(request, year, public):
275274
template = 'nomcom/private_feedback.html'
276275

277276
if not has_publickey:
278-
message = ('warning', "Nomcom don't have public key to ecrypt data, please contact with nomcom chair")
277+
message = ('warning', "This Nomcom is not yet accepting comments")
279278
return render_to_response(template,
280-
{'has_publickey': has_publickey,
281-
'message': message,
279+
{'message': message,
282280
'nomcom': nomcom,
283281
'year': year,
284282
'selected': 'feedback'}, RequestContext(request))
@@ -296,8 +294,7 @@ def feedback(request, year, public):
296294
position=position, nominee=nominee)
297295

298296
return render_to_response(template,
299-
{'has_publickey': has_publickey,
300-
'form': form,
297+
{'form': form,
301298
'message': message,
302299
'nomcom': nomcom,
303300
'year': year,
@@ -315,10 +312,9 @@ def private_questionnaire(request, year):
315312
template = 'nomcom/private_questionnaire.html'
316313

317314
if not has_publickey:
318-
message = ('warning', "Nomcom don't have public key to ecrypt data, please contact with nomcom chair")
315+
message = ('warning', "This Nomcom is not yet accepting questionnaires")
319316
return render_to_response(template,
320-
{'has_publickey': has_publickey,
321-
'message': message,
317+
{'message': message,
322318
'nomcom': nomcom,
323319
'year': year,
324320
'selected': 'questionnaire'}, RequestContext(request))
@@ -335,8 +331,7 @@ def private_questionnaire(request, year):
335331
form = QuestionnaireForm(nomcom=nomcom, user=request.user)
336332

337333
return render_to_response(template,
338-
{'has_publickey': has_publickey,
339-
'form': form,
334+
{'form': form,
340335
'questionnaire_response': questionnaire_response,
341336
'message': message,
342337
'nomcom': nomcom,

‎ietf/templates/nomcom/nomcom_private_base.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ <h1>Nomcom {{ year }} Private Area</h1>
88

99
<div class="ietf-navset">
1010
{% if selected == "index" %}<span class="selected">List of nominees</span>{% else %}<a href="{% url nomcom_private_index year %}">List of nominees</a>{% endif %} |
11-
{% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_private_nominate year %}">Nominate</a>{% endif %} |
12-
{% if selected == "feedback" %}<span class="selected">Provide comments</span>{% else %}<a href="{% url nomcom_private_feedback year %}">Provide comments</a>{% endif %} |
13-
{% if selected == "questionnaire" %}<span class="selected">Questionnaire response</span>{% else %}<a href="{% url nomcom_private_questionnaire year %}">Questionnaire response</a>{% endif %} |
11+
{% if nomcom|has_publickey %}
12+
{% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_private_nominate year %}">Nominate</a>{% endif %} |
13+
{% if selected == "feedback" %}<span class="selected">Provide comments</span>{% else %}<a href="{% url nomcom_private_feedback year %}">Provide comments</a>{% endif %} |
14+
{% if selected == "questionnaire" %}<span class="selected">Questionnaire response</span>{% else %}<a href="{% url nomcom_private_questionnaire year %}">Questionnaire response</a>{% endif %} |
15+
{% endif %}
1416
{% if selected == "view_feedback" %}<span class="selected">View comments</span>{% else %}<a href="{% url nomcom_view_feedback year %}">View comments</a>{% endif %} |
1517
{% if selected == "private_key" %}<span class="selected">Private key</span>{% else %}<a href="{% url nomcom_private_key year %}">Private key</a>{% endif %}
1618
{% if user|is_chair:year %} |

‎ietf/templates/nomcom/nomcom_public_base.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
{% extends "nomcom/nomcom_base.html" %}
22

3+
{% load nomcom_tags %}
4+
35
{% block content %}
46

57
<h1>Nomcom {{ year }} Pages</h1>
68

79
<div class="ietf-navset">
810
{% if selected == "index" %}<span class="selected">Home</span>{% else %}<a href="{% url nomcom_index year %}">Home</a>{% endif %} |
9-
{% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_public_nominate year %}">Nominate</a>{% endif %} |
10-
{% if selected == "feedback" %}<span class="selected">Provide Comments</span>{% else %}<a href="{% url nomcom_public_feedback year %}">Provide Comments</a>{% endif %} |
11+
{% if nomcom|has_publickey %}
12+
{% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_public_nominate year %}">Nominate</a>{% endif %} |
13+
{% if selected == "feedback" %}<span class="selected">Provide Comments</span>{% else %}<a href="{% url nomcom_public_feedback year %}">Provide Comments</a>{% endif %} |
14+
{% endif %}
1115
{% if selected == "requirements" %}<span class="selected">Requirements</span>{% else %}<a href="{% url nomcom_requirements year %}">Requirements</a>{% endif %} |
1216
{% if selected == "questionnaires" %}<span class="selected">Questionnaires</span>{% else %}<a href="{% url nomcom_questionnaires year %}">Questionnaires</a>{% endif %} |
1317
</div>

‎ietf/templates/nomcom/private_feedback.html‎

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

3+
{% load nomcom_tags %}
4+
35
{% block morecss %}
46
.content .primary {
57
width: 550px;
@@ -29,7 +31,7 @@
2931
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
3032
{% endif %}
3133

32-
{% if has_publickey %}
34+
{% if nomcom|has_publickey %}
3335

3436
<div class="js-info">
3537
Your browser has Javascript disabled. Please enable javascript and reload the page.

‎ietf/templates/nomcom/private_nominate.html‎

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

3+
{% load nomcom_tags %}
4+
35
{% block subtitle %} - Nominate{% endblock %}
46

57
{% block pagehead %}
@@ -13,7 +15,7 @@
1315
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
1416
{% endif %}
1517

16-
{% if has_publickey %}
18+
{% if nomcom|has_publickey %}
1719
{% if form.errors %}<div class="info-message-error">Please correct the following errors</div>{% endif %}
1820

1921
<form id="nominateform" action="" method="post">{% csrf_token %}

‎ietf/templates/nomcom/private_questionnaire.html‎

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

3+
{% load nomcom_tags %}
34

45
{% block subtitle %} - Quesionnaire Response{% endblock %}
56

@@ -14,7 +15,7 @@
1415
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
1516
{% endif %}
1617

17-
{% if has_publickey %}
18+
{% if nomcom|has_publickey %}
1819

1920
<div class="js-info">
2021
Your browser has Javascript disabled. Please enable javascript and reload the page.

‎ietf/templates/nomcom/public_feedback.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
3232
{% endif %}
3333

34-
{% if has_publickey %}
34+
{% if nomcom|has_publickey %}
3535

3636
<div class="js-info">
3737
Your browser has Javascript disabled. Please enable javascript and reload the page.

‎ietf/templates/nomcom/public_nominate.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{% extends "nomcom/nomcom_public_base.html" %}
22

3+
{% load nomcom_tags %}
4+
35
{% block subtitle %} - Nominate{% endblock %}
46

57
{% block pagehead %}
@@ -13,7 +15,7 @@
1315
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
1416
{% endif %}
1517

16-
{% if has_publickey %}
18+
{% if nomcom|has_publickey %}
1719
{% if form.errors %}<div class="info-message-error">Please correct the following errors</div>{% endif %}
1820

1921
<form id="nominateform" action="" method="post">{% csrf_token %}

0 commit comments

Comments
 (0)