altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Change message when public key does not exists

Browse source 
Refactor context views
Add new templatetags to check if the nomcom has public key
Fixes #1030
 - Legacy-Id: 5710
This commit is contained in:
Emilio Jiménez 2013-05-08 12:37:12 +00:00
parent 3d747dbcb7
commit 868a82a327
10 changed files with 41 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/nomcom/forms.py
View file

@ -133,6 +133,8 @@ class EditMembersFormPreview(FormPreview):
group = get_group_or_404(year)
self.state['group'] = group
self.state['rolodex_url'] = ROLODEX_URL
groups = group.nomcom_set.all()
self.nomcom = groups and groups[0] or None
self.group = group
self.year = year
@ -146,6 +148,7 @@ class EditMembersFormPreview(FormPreview):
'stage_field': self.unused_name('stage'),
'state': self.state,
'year': self.year,
'nomcom': self.nomcom,
'selected': 'edit_members'},
context_instance=RequestContext(request))

5
ietf/nomcom/templatetags/nomcom_tags.py
View file

@ -26,6 +26,11 @@ def is_chair(user, year):
return nomcom.group.is_chair(user)
@register.filter
def has_publickey(nomcom):
return nomcom and nomcom.public_key and True or False
@register.simple_tag
def add_num_nominations(user, position, nominee):
author = get_user_email(user)

25
ietf/nomcom/views.py
View file

@ -156,6 +156,7 @@ def send_reminder_mail(request, year):
'year': year,
'nominees': nominees,
'mail_template': mail_template,
'selected': 'send_reminder_mail',
'message': message}, RequestContext(request))
@ -218,10 +219,9 @@ def nominate(request, year, public):
template = 'nomcom/private_nominate.html'
if not has_publickey:
message = ('warning', "Nomcom don't have public key to ecrypt data, please contact with nomcom chair")
message = ('warning', "This Nomcom is not yet accepting nominations")
return render_to_response(template,
{'has_publickey': has_publickey,
'message': message,
{'message': message,
'nomcom': nomcom,
'year': year,
'selected': 'nominate'}, RequestContext(request))
@ -236,8 +236,7 @@ def nominate(request, year, public):
form = NominateForm(nomcom=nomcom, user=request.user, public=public)
return render_to_response(template,
{'has_publickey': has_publickey,
'form': form,
{'form': form,
'message': message,
'nomcom': nomcom,
'year': year,
@ -275,10 +274,9 @@ def feedback(request, year, public):
template = 'nomcom/private_feedback.html'
if not has_publickey:
message = ('warning', "Nomcom don't have public key to ecrypt data, please contact with nomcom chair")
message = ('warning', "This Nomcom is not yet accepting comments")
return render_to_response(template,
{'has_publickey': has_publickey,
'message': message,
{'message': message,
'nomcom': nomcom,
'year': year,
'selected': 'feedback'}, RequestContext(request))
@ -296,8 +294,7 @@ def feedback(request, year, public):
position=position, nominee=nominee)
return render_to_response(template,
{'has_publickey': has_publickey,
'form': form,
{'form': form,
'message': message,
'nomcom': nomcom,
'year': year,
@ -315,10 +312,9 @@ def private_questionnaire(request, year):
template = 'nomcom/private_questionnaire.html'
if not has_publickey:
message = ('warning', "Nomcom don't have public key to ecrypt data, please contact with nomcom chair")
message = ('warning', "This Nomcom is not yet accepting questionnaires")
return render_to_response(template,
{'has_publickey': has_publickey,
'message': message,
{'message': message,
'nomcom': nomcom,
'year': year,
'selected': 'questionnaire'}, RequestContext(request))
@ -335,8 +331,7 @@ def private_questionnaire(request, year):
form = QuestionnaireForm(nomcom=nomcom, user=request.user)
return render_to_response(template,
{'has_publickey': has_publickey,
'form': form,
{'form': form,
'questionnaire_response': questionnaire_response,
'message': message,
'nomcom': nomcom,

8
ietf/templates/nomcom/nomcom_private_base.html
View file

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

8
ietf/templates/nomcom/nomcom_public_base.html
View file

@ -1,13 +1,17 @@
{% extends "nomcom/nomcom_base.html" %}
{% load nomcom_tags %}
{% block content %}
<h1>Nomcom {{ year }} Pages</h1>
<div class="ietf-navset">
{% if selected == "index" %}<span class="selected">Home</span>{% else %}<a href="{% url nomcom_index year %}">Home</a>{% endif %} |
{% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_public_nominate year %}">Nominate</a>{% endif %} |
{% if selected == "feedback" %}<span class="selected">Provide Comments</span>{% else %}<a href="{% url nomcom_public_feedback year %}">Provide Comments</a>{% endif %} |
{% if nomcom|has_publickey %}
{% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_public_nominate year %}">Nominate</a>{% endif %} |
{% if selected == "feedback" %}<span class="selected">Provide Comments</span>{% else %}<a href="{% url nomcom_public_feedback year %}">Provide Comments</a>{% endif %} |
{% endif %}
{% if selected == "requirements" %}<span class="selected">Requirements</span>{% else %}<a href="{% url nomcom_requirements year %}">Requirements</a>{% endif %} |
{% if selected == "questionnaires" %}<span class="selected">Questionnaires</span>{% else %}<a href="{% url nomcom_questionnaires year %}">Questionnaires</a>{% endif %} |
</div>

4
ietf/templates/nomcom/private_feedback.html
View file

@ -1,5 +1,7 @@
{% extends "nomcom/nomcom_private_base.html" %}
{% load nomcom_tags %}
{% block morecss %}
.content .primary {
width: 550px;
@ -29,7 +31,7 @@ table.nominees tr td {
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
{% endif %}
{% if has_publickey %}
{% if nomcom|has_publickey %}
<div class="js-info">
Your browser has Javascript disabled. Please enable javascript and reload the page.

4
ietf/templates/nomcom/private_nominate.html
View file

@ -1,5 +1,7 @@
{% extends "nomcom/nomcom_private_base.html" %}
{% load nomcom_tags %}
{% block subtitle %} - Nominate{% endblock %}
{% block pagehead %}
@ -13,7 +15,7 @@
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
{% endif %}
{% if has_publickey %}
{% if nomcom|has_publickey %}
{% if form.errors %}<div class="info-message-error">Please correct the following errors</div>{% endif %}
<form id="nominateform" action="" method="post">{% csrf_token %}

3
ietf/templates/nomcom/private_questionnaire.html
View file

@ -1,5 +1,6 @@
{% extends "nomcom/nomcom_private_base.html" %}
{% load nomcom_tags %}
{% block subtitle %} - Quesionnaire Response{% endblock %}
@ -14,7 +15,7 @@
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
{% endif %}
{% if has_publickey %}
{% if nomcom|has_publickey %}
<div class="js-info">
Your browser has Javascript disabled. Please enable javascript and reload the page.

2
ietf/templates/nomcom/public_feedback.html
View file

@ -31,7 +31,7 @@ table.nominees tr td {
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
{% endif %}
{% if has_publickey %}
{% if nomcom|has_publickey %}
<div class="js-info">
Your browser has Javascript disabled. Please enable javascript and reload the page.

4
ietf/templates/nomcom/public_nominate.html
View file

@ -1,5 +1,7 @@
{% extends "nomcom/nomcom_public_base.html" %}
{% load nomcom_tags %}
{% block subtitle %} - Nominate{% endblock %}
{% block pagehead %}
@ -13,7 +15,7 @@
<div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
{% endif %}
{% if has_publickey %}
{% if nomcom|has_publickey %}
{% if form.errors %}<div class="info-message-error">Please correct the following errors</div>{% endif %}
<form id="nominateform" action="" method="post">{% csrf_token %}