From 868a82a3272cd6e9e988354c8a0afc9cd699b704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Jim=C3=A9nez?= Date: Wed, 8 May 2013 12:37:12 +0000 Subject: [PATCH] Change message when public key does not exists Refactor context views Add new templatetags to check if the nomcom has public key Fixes #1030 - Legacy-Id: 5710 --- ietf/nomcom/forms.py | 3 +++ ietf/nomcom/templatetags/nomcom_tags.py | 5 ++++ ietf/nomcom/views.py | 25 ++++++++----------- .../templates/nomcom/nomcom_private_base.html | 8 +++--- ietf/templates/nomcom/nomcom_public_base.html | 8 ++++-- ietf/templates/nomcom/private_feedback.html | 4 ++- ietf/templates/nomcom/private_nominate.html | 4 ++- .../nomcom/private_questionnaire.html | 3 ++- ietf/templates/nomcom/public_feedback.html | 2 +- ietf/templates/nomcom/public_nominate.html | 4 ++- 10 files changed, 41 insertions(+), 25 deletions(-) diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py index f3ce88971..e6b1cd0e9 100644 --- a/ietf/nomcom/forms.py +++ b/ietf/nomcom/forms.py @@ -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)) diff --git a/ietf/nomcom/templatetags/nomcom_tags.py b/ietf/nomcom/templatetags/nomcom_tags.py index 9444642e5..9821e0487 100644 --- a/ietf/nomcom/templatetags/nomcom_tags.py +++ b/ietf/nomcom/templatetags/nomcom_tags.py @@ -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) diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index 015273627..0550e5328 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -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, diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html index 4e3e1b67b..f1a92a132 100644 --- a/ietf/templates/nomcom/nomcom_private_base.html +++ b/ietf/templates/nomcom/nomcom_private_base.html @@ -8,9 +8,11 @@
{% if selected == "index" %}List of nominees{% else %}List of nominees{% endif %} | - {% if selected == "nominate" %}Nominate{% else %}Nominate{% endif %} | - {% if selected == "feedback" %}Provide comments{% else %}Provide comments{% endif %} | - {% if selected == "questionnaire" %}Questionnaire response{% else %}Questionnaire response{% endif %} | + {% if nomcom|has_publickey %} + {% if selected == "nominate" %}Nominate{% else %}Nominate{% endif %} | + {% if selected == "feedback" %}Provide comments{% else %}Provide comments{% endif %} | + {% if selected == "questionnaire" %}Questionnaire response{% else %}Questionnaire response{% endif %} | + {% endif %} {% if selected == "view_feedback" %}View comments{% else %}View comments{% endif %} | {% if selected == "private_key" %}Private key{% else %}Private key{% endif %} {% if user|is_chair:year %} | diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html index a18cc0d96..daa5027ba 100644 --- a/ietf/templates/nomcom/nomcom_public_base.html +++ b/ietf/templates/nomcom/nomcom_public_base.html @@ -1,13 +1,17 @@ {% extends "nomcom/nomcom_base.html" %} +{% load nomcom_tags %} + {% block content %}

Nomcom {{ year }} Pages

{% if selected == "index" %}Home{% else %}Home{% endif %} | - {% if selected == "nominate" %}Nominate{% else %}Nominate{% endif %} | - {% if selected == "feedback" %}Provide Comments{% else %}Provide Comments{% endif %} | + {% if nomcom|has_publickey %} + {% if selected == "nominate" %}Nominate{% else %}Nominate{% endif %} | + {% if selected == "feedback" %}Provide Comments{% else %}Provide Comments{% endif %} | + {% endif %} {% if selected == "requirements" %}Requirements{% else %}Requirements{% endif %} | {% if selected == "questionnaires" %}Questionnaires{% else %}Questionnaires{% endif %} |
diff --git a/ietf/templates/nomcom/private_feedback.html b/ietf/templates/nomcom/private_feedback.html index fb1d7bd9f..62116554e 100644 --- a/ietf/templates/nomcom/private_feedback.html +++ b/ietf/templates/nomcom/private_feedback.html @@ -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 {
{{ message.1 }}
{% endif %} -{% if has_publickey %} +{% if nomcom|has_publickey %}
Your browser has Javascript disabled. Please enable javascript and reload the page. diff --git a/ietf/templates/nomcom/private_nominate.html b/ietf/templates/nomcom/private_nominate.html index 7f403e11a..75bf79a11 100644 --- a/ietf/templates/nomcom/private_nominate.html +++ b/ietf/templates/nomcom/private_nominate.html @@ -1,5 +1,7 @@ {% extends "nomcom/nomcom_private_base.html" %} +{% load nomcom_tags %} + {% block subtitle %} - Nominate{% endblock %} {% block pagehead %} @@ -13,7 +15,7 @@
{{ message.1 }}
{% endif %} -{% if has_publickey %} +{% if nomcom|has_publickey %} {% if form.errors %}
Please correct the following errors
{% endif %}
{% csrf_token %} diff --git a/ietf/templates/nomcom/private_questionnaire.html b/ietf/templates/nomcom/private_questionnaire.html index 212184ab0..726ff0cec 100644 --- a/ietf/templates/nomcom/private_questionnaire.html +++ b/ietf/templates/nomcom/private_questionnaire.html @@ -1,5 +1,6 @@ {% extends "nomcom/nomcom_private_base.html" %} +{% load nomcom_tags %} {% block subtitle %} - Quesionnaire Response{% endblock %} @@ -14,7 +15,7 @@
{{ message.1 }}
{% endif %} -{% if has_publickey %} +{% if nomcom|has_publickey %}
Your browser has Javascript disabled. Please enable javascript and reload the page. diff --git a/ietf/templates/nomcom/public_feedback.html b/ietf/templates/nomcom/public_feedback.html index 9938c655d..caf171cd7 100644 --- a/ietf/templates/nomcom/public_feedback.html +++ b/ietf/templates/nomcom/public_feedback.html @@ -31,7 +31,7 @@ table.nominees tr td {
{{ message.1 }}
{% endif %} -{% if has_publickey %} +{% if nomcom|has_publickey %}
Your browser has Javascript disabled. Please enable javascript and reload the page. diff --git a/ietf/templates/nomcom/public_nominate.html b/ietf/templates/nomcom/public_nominate.html index f51f69caa..ffd2b6c6b 100644 --- a/ietf/templates/nomcom/public_nominate.html +++ b/ietf/templates/nomcom/public_nominate.html @@ -1,5 +1,7 @@ {% extends "nomcom/nomcom_public_base.html" %} +{% load nomcom_tags %} + {% block subtitle %} - Nominate{% endblock %} {% block pagehead %} @@ -13,7 +15,7 @@
{{ message.1 }}
{% endif %} -{% if has_publickey %} +{% if nomcom|has_publickey %} {% if form.errors %}
Please correct the following errors
{% endif %} {% csrf_token %}