TUNE-72: use a ModelChoiceField, layout

praekeltfoundation · Apr 8, 2016 · 88af45d · 88af45d
1 parent 6a706dd
commit 88af45d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/molo/commenting/forms.py b/molo/commenting/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from django.db import OperationalError
+from django.forms import ModelChoiceField
 from django.utils.translation import ugettext_lazy as _
 from django_comments.forms import CommentForm
 from molo.commenting.models import MoloComment, CannedResponse
@@ -43,16 +43,6 @@ def get_comment_object(self):
         return new
 
 
-def get_canned_choices():
-    canned_choices = [('', '---------')]
-    try:
-        canned_choices += ([(canned.response, canned.response_header) for canned in CannedResponse.objects.all()])
-    except OperationalError:
-        canned_choices = []
-
-    return canned_choices
-
-
 class MoloCommentReplyForm(MoloCommentForm):
     parent = forms.ModelChoiceField(
         queryset=MoloComment.objects.all(), widget=forms.HiddenInput,
@@ -66,8 +56,13 @@ class MoloCommentReplyForm(MoloCommentForm):
     honeypot = forms.CharField(
         required=False, widget=forms.HiddenInput)
 
+    canned_response = ModelChoiceField(queryset=CannedResponse.objects.all(),
+                                       label="Or add a canned response",
+                                       to_field_name="response",
+                                       required=False)
+
     def __init__(self, *args, **kwargs):
         parent = MoloComment.objects.get(pk=kwargs.pop('parent'))
-        super(MoloCommentReplyForm, self).__init__(parent.content_object, *args, **kwargs)
-        self.fields['canned_select'] = forms.ChoiceField(choices=get_canned_choices(),
-                                                         label="Or add a Canned response", required=False)
+        super(MoloCommentReplyForm, self).__init__(
+            parent.content_object, *args, **kwargs
+        )
diff --git a/molo/commenting/models.py b/molo/commenting/models.py
@@ -54,9 +54,9 @@ class CannedResponse(models.Model):
     date_added = models.DateTimeField(auto_now_add=True)
 
     def __unicode__(self):
-        return self.response
+        return self.response_header
 
     class Meta:
-        verbose_name_plural = 'Canned replies'
+        verbose_name_plural = 'Canned responses'
         app_label = 'commenting'
         ordering = ['response_header', 'response']
diff --git a/molo/commenting/templates/admin/reply.html b/molo/commenting/templates/admin/reply.html
@@ -14,15 +14,15 @@
 {% block content %}
 <form action="" method="post">
     {% csrf_token %}
-    {{ form }}
+    {{ form.as_p }}
     <input type="submit" value="Reply" />
 </form>
 
 <script>
-var cannedSelect = document.getElementById("id_canned_select");
-document.getElementsByTagName("form")[0].setAttribute("onchange", "commentReply()");
-function commentReply() {
-    document.getElementById('id_comment').innerHTML = (cannedSelect[cannedSelect.selectedIndex].value);
+var cannedSelect = document.getElementById("id_canned_response");
+cannedSelect.setAttribute("onchange", "setCannedResponse()");
+function setCannedResponse() {
+    document.getElementById('id_comment').innerHTML = cannedSelect[cannedSelect.selectedIndex].value;
 }
 </script>