From 9409776be8bfe4a24635ec72cf493e9b12bc0e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Jim=C3=A9nez?= Date: Thu, 2 May 2013 08:03:24 +0000 Subject: [PATCH] change "Questionnaire Response" label See #1003 - Legacy-Id: 5687 --- ietf/name/fixtures/names.xml | 2 +- ietf/name/migrations/0008_add_feedback_types.py | 2 +- ietf/nomcom/forms.py | 6 +++--- ietf/nomcom/urls.py | 2 +- ietf/nomcom/views.py | 2 +- ietf/templates/nomcom/nomcom_private_base.html | 2 +- ietf/templates/nomcom/private_index.html | 4 ++-- ietf/templates/nomcom/private_questionnaire.html | 2 +- ietf/templates/nomcom/view_feedback.html | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ietf/name/fixtures/names.xml b/ietf/name/fixtures/names.xml index a052b14c7..9ce3fbd3a 100644 --- a/ietf/name/fixtures/names.xml +++ b/ietf/name/fixtures/names.xml @@ -542,7 +542,7 @@ 0 - Questionnaire + Questionnaire response True 0 diff --git a/ietf/name/migrations/0008_add_feedback_types.py b/ietf/name/migrations/0008_add_feedback_types.py index 8c27ad41f..00b775933 100644 --- a/ietf/name/migrations/0008_add_feedback_types.py +++ b/ietf/name/migrations/0008_add_feedback_types.py @@ -8,7 +8,7 @@ class Migration(DataMigration): def forwards(self, orm): types = {'nomina': 'Nomination', - 'questio': 'Questionnaire', + 'questio': 'Questionnaire response', 'comment': 'Comment'} for slug, name in types.iteritems(): FeedbackType.objects.get_or_create(slug=slug, name=name, used=True) diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py index d1447f21a..c259fa33c 100644 --- a/ietf/nomcom/forms.py +++ b/ietf/nomcom/forms.py @@ -655,9 +655,9 @@ class FeedbackForm(BaseNomcomForm, forms.ModelForm): class QuestionnaireForm(BaseNomcomForm, forms.ModelForm): - comments = forms.CharField(label='Questionnaire on this candidate', + comments = forms.CharField(label='Questionnaire response from this candidate', widget=forms.Textarea()) - fieldsets = [('Provide questionnaires', ('nominee', + fieldsets = [('Questionnaire response', ('nominee', 'comments'))] def __init__(self, *args, **kwargs): @@ -666,7 +666,7 @@ class QuestionnaireForm(BaseNomcomForm, forms.ModelForm): super(QuestionnaireForm, self).__init__(*args, **kwargs) self.fields['nominee'] = PositionNomineeField(nomcom=self.nomcom, required=True) - + def save(self, commit=True): feedback = super(QuestionnaireForm, self).save(commit=False) diff --git a/ietf/nomcom/urls.py b/ietf/nomcom/urls.py index 11efd5efe..12982285b 100644 --- a/ietf/nomcom/urls.py +++ b/ietf/nomcom/urls.py @@ -8,7 +8,7 @@ urlpatterns = patterns('ietf.nomcom.views', url(r'^(?P\d{4})/private/key/$', 'private_key', name='nomcom_private_key'), url(r'^(?P\d{4})/private/nominate/$', 'private_nominate', name='nomcom_private_nominate'), url(r'^(?P\d{4})/private/feedback/$', 'private_feedback', name='nomcom_private_feedback'), - url(r'^(?P\d{4})/private/questionnaire/$', 'private_questionnaire', name='nomcom_private_questionnaire'), + url(r'^(?P\d{4})/private/questionnaire-response/$', 'private_questionnaire', name='nomcom_private_questionnaire'), url(r'^(?P\d{4})/private/view-feedback/$', 'view_feedback', name='nomcom_view_feedback'), url(r'^(?P\d{4})/private/view-feedback/pending/$', 'view_feedback_pending', name='nomcom_view_feedback_pending'), url(r'^(?P\d{4})/private/view-feedback/nominee/(?P\d+)$', 'view_feedback_nominee', name='nomcom_view_feedback_nominee'), diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index d6dd4815f..59f19af1c 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -326,7 +326,7 @@ def private_questionnaire(request, year): nomcom=nomcom, user=request.user) if form.is_valid(): form.save() - message = ('success', 'The questionnaire has been registered.') + message = ('success', 'The questionnaire response has been registered.') else: form = QuestionnaireForm(nomcom=nomcom, user=request.user) diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html index c70ab35ff..f0cda9c69 100644 --- a/ietf/templates/nomcom/nomcom_private_base.html +++ b/ietf/templates/nomcom/nomcom_private_base.html @@ -10,7 +10,7 @@ {% 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" %}Provide questionnaires{% else %}Provide questionnaires{% endif %} | + {% if selected == "questionnaire" %}Questionnaire response{% else %}Questionnaire response{% 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/private_index.html b/ietf/templates/nomcom/private_index.html index 6b045f602..43dc6c4ef 100644 --- a/ietf/templates/nomcom/private_index.html +++ b/ietf/templates/nomcom/private_index.html @@ -12,7 +12,7 @@ Accepted Declined Pending - Questionnaire + Questionnaire response Total {% for item in stats %} @@ -101,7 +101,7 @@ replied to the nomination notification they have received.){% endif %}

Nominees Position State - Questionnaire + Questionnaire response {% for np in nominee_positions.not_duplicated %} diff --git a/ietf/templates/nomcom/private_questionnaire.html b/ietf/templates/nomcom/private_questionnaire.html index 7befdd164..4c77f8a4b 100644 --- a/ietf/templates/nomcom/private_questionnaire.html +++ b/ietf/templates/nomcom/private_questionnaire.html @@ -1,7 +1,7 @@ {% extends "nomcom/nomcom_private_base.html" %} -{% block subtitle %} - Provide Quesionnaire{% endblock %} +{% block subtitle %} - Quesionnaire Response{% endblock %} {% block pagehead %} {{ form.media }} diff --git a/ietf/templates/nomcom/view_feedback.html b/ietf/templates/nomcom/view_feedback.html index 293bebef6..b9188cb46 100644 --- a/ietf/templates/nomcom/view_feedback.html +++ b/ietf/templates/nomcom/view_feedback.html @@ -15,7 +15,7 @@ Nominee Nominations Comments - Questionnaires + Questionnaire response {% for nominee in nominees %}