Add subject field to feedback model

New form to fill feedback mail via web.
Fixes ietf-tools#1042 ietf-tools#1043
 - Legacy-Id: 5748

Author: ejimenez

ietf/nomcom/forms.py

@@ -20,7 +20,7 @@
                                Position, Feedback, ReminderDates
 from ietf.nomcom.utils import (NOMINATION_RECEIPT_TEMPLATE, FEEDBACK_RECEIPT_TEMPLATE,
                                get_user_email, validate_private_key, validate_public_key,
-                               get_or_create_nominee)
+                               get_or_create_nominee, create_feedback_email)
 from ietf.nomcom.decorators import nomcom_member_required
 
 
@@ -609,6 +609,24 @@ class Media:
               "/js/nomcom.js", )
 
 
+class FeedbackEmailForm(BaseNomcomForm, forms.Form):
+
+    email_text = forms.CharField(label='Email text', widget=forms.Textarea())
+
+    fieldsets = [('Feedback email', ('email_text',))]
+
+    def __init__(self, *args, **kwargs):
+        self.nomcom = kwargs.pop('nomcom', None)
+        super(FeedbackEmailForm, self).__init__(*args, **kwargs)
+
+    def save(self, commit=True):
+        create_feedback_email(self.nomcom, self.cleaned_data['email_text'])
+
+    class Media:
+        js = ("/js/jquery-1.5.1.min.js",
+              "/js/nomcom.js", )
+
+
 class QuestionnaireForm(BaseNomcomForm, forms.ModelForm):
 
     comments = forms.CharField(label='Questionnaire response from this candidate',

ietf/nomcom/management/commands/feedback_email.py

@@ -1,19 +1,17 @@
 from optparse import make_option
-from email.utils import parseaddr
 import syslog
 
 from django.core.management.base import BaseCommand, CommandError
 
-from ietf.nomcom.utils import parse_email
-from ietf.nomcom.models import NomCom, Feedback
+from ietf.nomcom.models import NomCom
+from ietf.nomcom.utils import create_feedback_email
 
 
 class Command(BaseCommand):
     help = (u"Registry feedback from email. Usage: feeback_email --nomcom-year <nomcom-year> --email-file <email-file>")
     option_list = BaseCommand.option_list + (
          make_option('--nomcom-year', dest='year', help='NomCom year'),
-         make_option('--email-file', dest='email', help='Feedback email'),
-        )
+         make_option('--email-file', dest='email', help='Feedback email'),)
 
     def handle(self, *args, **options):
         email = options.get('email', None)
@@ -36,13 +34,5 @@ def handle(self, *args, **options):
         except NomCom.DoesNotExist:
             raise CommandError("NomCom %s does not exist or it isn't active" % year)
 
-        by, subject, body = parse_email(msg)
-        body = 'Subject: %s\n\n%s' % (subject, body)
-        name, addr = parseaddr(by)
-
-        feedback = Feedback(nomcom=nomcom,
-                            author=addr,
-                            comments=body)
-        feedback.save()
-
-        syslog.syslog(u"Read feedback email by %s" % by)
+        feedback = create_feedback_email(nomcom, msg)
+        syslog.syslog(u"Read feedback email by %s" % feedback.author)

ietf/nomcom/migrations/0003_auto__add_field_feedback_subject.py

@@ -185,6 +185,7 @@ class Feedback(models.Model):
     author = models.EmailField(verbose_name='Author', blank=True)
     positions = models.ManyToManyField('Position', blank=True, null=True)
     nominees = models.ManyToManyField('Nominee', blank=True, null=True)
+    subject = models.TextField(verbose_name='Subject', blank=True)
     comments = EncryptedTextField(verbose_name='Comments')
     type = models.ForeignKey(FeedbackType, blank=True, null=True)
     user = models.ForeignKey(User, editable=False, blank=True, null=True)

ietf/nomcom/models.py

@@ -8,6 +8,7 @@
     url(r'^(?P<year>\d{4})/private/key/$', 'private_key', name='nomcom_private_key'),
     url(r'^(?P<year>\d{4})/private/nominate/$', 'private_nominate', name='nomcom_private_nominate'),
     url(r'^(?P<year>\d{4})/private/feedback/$', 'private_feedback', name='nomcom_private_feedback'),
+    url(r'^(?P<year>\d{4})/private/feedback-email/$', 'private_feedback_email', name='nomcom_private_feedback_email'),
     url(r'^(?P<year>\d{4})/private/questionnaire-response/$', 'private_questionnaire', name='nomcom_private_questionnaire'),
     url(r'^(?P<year>\d{4})/private/view-feedback/$', 'view_feedback', name='nomcom_view_feedback'),
     url(r'^(?P<year>\d{4})/private/view-feedback/unrelated/$', 'view_feedback_unrelated', name='nomcom_view_feedback_unrelated'),

ietf/nomcom/urls.py

@@ -5,6 +5,8 @@
 import re
 import tempfile
 
+from email.utils import parseaddr
+
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core.exceptions import PermissionDenied
@@ -155,7 +157,8 @@ def extract_body(payload):
     if isinstance(payload, str):
         return payload
     else:
-        return '\n'.join([extract_body(part.get_payload()) for part in payload])
+        if payload:
+            return '\n'.join([extract_body(part.get_payload()) for part in payload])
 
 
 def parse_email(text):
@@ -164,7 +167,7 @@ def parse_email(text):
     # comment
     #body = quopri.decodestring(extract_body(msg.get_payload()))
     charset = msg.get_content_charset()
-    body = extract_body(msg.get_payload(decode=True))
+    body = extract_body(msg.get_payload())
     if charset:
         body = body.decode(charset)
 
@@ -339,3 +342,16 @@ def get_or_create_nominee(nomcom, candidate_name, candidate_email, position, aut
     send_mail(None, to_email, from_email, subject, path, context)
 
     return nominee
+
+
+def create_feedback_email(nomcom, msg):
+    from ietf.nomcom.models import Feedback
+    by, subject, body = parse_email(msg)
+    name, addr = parseaddr(by)
+
+    feedback = Feedback(nomcom=nomcom,
+                        author=addr,
+                        subject=subject,
+                        comments=body)
+    feedback.save()
+    return feedback

ietf/nomcom/utils.py

@@ -24,7 +24,8 @@
 from ietf.nomcom.forms import (NominateForm, FeedbackForm, QuestionnaireForm,
                                MergeForm, NomComTemplateForm, PositionForm,
                                PrivateKeyForm, EditNomcomForm, EditNomineeForm,
-                               PendingFeedbackForm, ReminderDatesForm, FullFeedbackFormSet)
+                               PendingFeedbackForm, ReminderDatesForm, FullFeedbackFormSet,
+                               FeedbackEmailForm)
 from ietf.nomcom.models import Position, NomineePosition, Nominee, Feedback, NomCom, ReminderDates
 from ietf.nomcom.utils import (get_nomcom_by_year, store_nomcom_private_key,
                                get_hash_nominee_position, send_reminder_to_nominees,
@@ -304,6 +305,38 @@ def feedback(request, year, public):
                                'selected': 'feedback'}, RequestContext(request))
 
 
+@nomcom_member_required(role='chair')
+def private_feedback_email(request, year):
+    nomcom = get_nomcom_by_year(year)
+    has_publickey = nomcom.public_key and True or False
+    message = None
+    template = 'nomcom/private_feedback_email.html'
+
+    if not has_publickey:
+            message = ('warning', "This Nomcom is not yet accepting feedback email")
+            return render_to_response(template,
+                              {'message': message,
+                               'nomcom': nomcom,
+                               'year': year,
+                               'selected': 'feedback_email'}, RequestContext(request))
+
+    form = FeedbackEmailForm(nomcom=nomcom)
+
+    if request.method == 'POST':
+        form = FeedbackEmailForm(data=request.POST,
+                                 nomcom=nomcom)
+        if form.is_valid():
+            form.save()
+            message = ('success', 'The feedback email has been registered.')
+
+    return render_to_response(template,
+                              {'form': form,
+                               'message': message,
+                               'nomcom': nomcom,
+                               'year': year,
+                               'selected': 'feedback_email'}, RequestContext(request))
+
+
 @nomcom_member_required(role='chair')
 def private_questionnaire(request, year):
     nomcom = get_nomcom_by_year(year)

ietf/nomcom/views.py

@@ -16,6 +16,7 @@ <h1>Nomcom {{ year }} Private Area</h1>
     {% 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 %} |
+      {% if selected == "feedback_email" %}<span class="selected">Provide Email Feedback</span>{% else %}<a href="{% url nomcom_private_feedback_email year %}">Provide Email Feedback</a>{% endif %} |
       {% if selected == "merge" %}<span class="selected">Merge nominee email addr</span>{% else %}<a href="{% url nomcom_private_merge year %}">Merge nominee email addr</a>{% endif %} |
       {% if selected == "send_reminder_mail" %}<span class="selected">Send Reminder Mail</span>{% else %}<a href="{% url nomcom_send_reminder_mail year %}">Send reminder mail</a>{% endif %} |
       {% if selected == "edit_members" %}<span class="selected">Nomcom members</span>{% else %}<a href="{% url nomcom_edit_members year %}">Nomcom members</a>{% endif %} |

ietf/templates/nomcom/nomcom_private_base.html

@@ -0,0 +1,45 @@
+{% extends "nomcom/nomcom_private_base.html" %}
+
+{% load nomcom_tags %}
+
+{% block subtitle %} - Provide feeback email{% endblock %}
+
+{% block pagehead %}
+{{ form.media }}
+{% endblock %}
+
+{% block nomcom_content %}
+
+
+{% if message %}
+  <div class="info-message-{{ message.0 }}">{{ message.1 }}</div>
+{% endif %}
+
+{% if nomcom|has_publickey %}
+
+  <div class="js-info">
+    Your browser has Javascript disabled. Please enable javascript and reload the page.
+    <script type="text/javascript">
+      (function ($) {
+        $(".js-info").hide();
+      })(jQuery);
+    </script>
+  </div>
+
+  <div>
+    {% if form.errors %}<div class="info-message-error">Please correct the following errors</div>{% endif %}
+
+    <form id="questionnnaireform" action="" method="post">{% csrf_token %}
+      {{ form }}
+
+    <div class="submitrow">
+      <input type="submit" value="Save" name="save" {% if submit_disabled %}disabled="disabled"{% endif %}/>
+    </div>
+
+    </form>
+  </div>
+
+{% endif %}
+
+
+{% endblock %}

ietf/templates/nomcom/private_feedback_email.html

@@ -34,17 +34,19 @@ <h3 class="ietf-divider">From {{ feedback.author|formatted_email|default:"Anonym
               {% ifequal ft.slug "nomina" %}
                 {% for fn in feedback.nomination_set.all %}
                   {% if fn.candidate_name %}
-                    <p><b>Candidate name:</b> {{ fn.candidate_name }}</p>
+                    <h3>Candidate name:</h3> <pre>{{ fn.candidate_name }}</pre>
                   {% endif %}
                   {% if fn.candidate_phone %}
-                    <p><b>Candidate phone:</b> {{ fn.candidate_phone }}</p>
+                    <h3>Candidate phone:</h3> <pre>{{ fn.candidate_phone }}</pre>
                   {% endif %}
                 {% endfor %}
               {% endifequal %}
-              <b>Positions:</b> {{ feedback.positions.all|join:"," }}
-              <p>
-                {% decrypt feedback.comments request year %}
-              </p>
+              <h3>Positions:</h3> <pre>{{ feedback.positions.all|join:"," }}</pre>
+              {% if feedback.subject %}
+                <h3>Subject:</h3> <pre>{{ feedback.subject }}</pre>
+              {% endif %}
+              <h3>Body</h3>
+                <pre>{% decrypt feedback.comments request year %}</pre>
             </div>
           {% endifequal %}
         {% endfor %}