Fix related topic forms & reenable in topic editing view

Author: ptgolden

editorsnotes/admin_custom/forms/common.py

@@ -8,20 +8,37 @@
 
 from editorsnotes.main.models.topics import Topic, TopicAssignment
 
-#class TopicAssignmentWidget(forms.widgets.HiddenInput):
-#    def render(self, name, value, attrs=None):
-#        hidden_input = super(TopicAssignmentWidget, self).render(name, value, attrs=None)
-#        if value:
-#            topic = get_object_or_404(ProjectTopicContainer, id=value)
-#            extra_content = topic.preferred_name
-#        else:
-#            extra_content = ''
-#        return mark_safe(extra_content + hidden_input)
-#
-#class TopicAssignmentForm(ModelForm):
-#    class Meta:
-#        model = TopicNodeAssignment
-#        widgets = {'topic': TopicNodeAssignmentWidget()}
-#
-#TopicAssignmentFormset = generic_inlineformset_factory(
-#    TopicNodeAssignment, form=TopicNodeAssignmentForm, extra=1)
+class TopicAssignmentWidget(forms.widgets.HiddenInput):
+    def render(self, name, value, attrs=None):
+        hidden_input = super(TopicAssignmentWidget, self).render(name, value, attrs=None)
+        if value:
+            topic = get_object_or_404(Topic, id=value)
+            extra_content = topic.preferred_name
+        else:
+            extra_content = ''
+        return mark_safe(extra_content + hidden_input)
+
+class TopicAssignmentForm(ModelForm):
+    topic_id = forms.IntegerField(widget=TopicAssignmentWidget)
+    class Meta:
+        model = TopicAssignment
+        fields = ('topic_id',)
+    def __init__(self, *args, **kwargs):
+        super(TopicAssignmentForm, self).__init__(*args, **kwargs)
+        if self.instance and self.instance.id:
+            self.fields['topic_id'].initial = self.instance.topic.id
+    def clean_topic_id(self):
+        data = self.cleaned_data['topic_id']
+        if self.instance and self.instance.id:
+            return data
+        # If this is a new object, the "topic_id" is actually the
+        # "topic_node_id". This is hacky and will be removed when we eventually
+        # create interfaces for editing anything with the API
+        topic_qs = Topic.objects.filter(topic_node_id=data)
+        if not topic_qs.exists():
+            raise forms.ValidationError('This topic does not exist.')
+        self.cleaned_data['topic_qs'] = topic_qs
+        return data
+
+TopicAssignmentFormset = generic_inlineformset_factory(
+    TopicAssignment, form=TopicAssignmentForm, extra=1)

editorsnotes/admin_custom/static/function/admin-bootstrap-base.js

@@ -262,7 +262,7 @@ $(document).ready(function () {
         // Replace this input with a text field
         $oldExtraField
           .prepend(ui.item.label)
-          .find('input[name$=topic]').val(ui.item.id);
+          .find('input[name$="topic_id"]').val(ui.item.id);
 
         // Clear this input
         event.preventDefault();

editorsnotes/admin_custom/templates/topic_admin.html

@@ -40,14 +40,12 @@ <h3>{% if form.instance.id %}Change {% else %}Add {% endif %}topic</h3>
     </fieldset>
     {% endwith %}
 
-    {% comment %}
     {% with formset=formsets.topicassignment %}
     <fieldset name="related_topics_fields" class="related-topics">
       <legend>Related topics</legend>
       {% include "includes/bootstrap_formset.html" %}
     </fieldset>
     {% endwith %}
-    {% endcomment %}
 
     <fieldset name="article_fields">
       <legend>Article</legend>

editorsnotes/admin_custom/tests.py

@@ -9,10 +9,10 @@
 
 class TopicAdminTestCase(WebTest):
     fixtures = ['projects.json']
-    def create_test_topic(self):
+    def create_test_topic(self, name=u'Emma Goldman'):
         project = main_models.Project.objects.get(slug='emma');
         node, topic = main_models.Topic.objects.create_along_with_node(
-            u'Emma Goldman', project, project.members.get())
+            name, project, project.members.get())
         return topic
     def test_create_topic(self):
         "A user should be able to create a topic with a unique name."
@@ -58,6 +58,43 @@ def test_add_citation(self):
         self.assertEqual(topic.summary_cites.get().document_id, document.id)
         self.assertEqual(topic.summary_cites.get().object_id, topic.id)
 
+    def test_add_related_topics(self):
+        topic = self.create_test_topic()
+
+        # This is to make sure topic id counter and topic node id counter are
+        # off. hope you can handle that
+        main_models.TopicNode.objects.create(_preferred_name='dummy',
+                                             creator_id=1, last_updater_id=1)
+
+        topic_2 = self.create_test_topic(name=u'Alexander Berkman')
+        topic_3 = self.create_test_topic(name=u'Ben Reitman')
+
+        url = reverse('admin:main_topic_change',
+                      kwargs={'project_slug': 'emma', 'topic_node_id': topic.topic_node_id})
+
+        # Add one topic
+        form = self.app.get(url, user='barry').forms[1]
+        form['topicassignment-0-topic_id'] = topic_2.topic_node_id
+        resp = form.submit().follow()
+        self.assertEqual(topic.related_topics.count(), 1)
+        self.assertEqual(topic.related_topics.get().topic_id, topic_2.id)
+
+        # Add another topic
+        form = self.app.get(url, user='barry').forms[1]
+        form['topicassignment-1-topic_id'] = topic_3.topic_node_id
+        resp = form.submit().follow()
+        self.assertEqual(topic.related_topics.count(), 2)
+        self.assertEqual(sorted([topic_2.id, topic_3.id]),
+                         sorted(topic.related_topics.values_list('topic_id', flat=True)))
+
+        # Delete both topics
+        form = self.app.get(url, user='barry').forms[1]
+        form['topicassignment-0-DELETE'] = 'true'
+        form['topicassignment-1-DELETE'] = 'true'
+        resp = form.submit().follow()
+        self.assertEqual(topic.related_topics.count(), 0)
+
+
     def test_create_empty_topic_error(self):
         "A user should not be able to create a topic with an empty name."
         add_url = reverse('admin:main_topic_add', kwargs={'project_slug': 'emma'})

editorsnotes/admin_custom/views/common.py

@@ -6,7 +6,7 @@
 from django.views.generic.edit import View, ModelFormMixin, TemplateResponseMixin
 import reversion
 
-from editorsnotes.main.models import Project
+from editorsnotes.main.models import Project, Topic
 from editorsnotes.main.models.auth import RevisionProject
 
 VIEW_ERROR_MSG = 'You do not have permission to view {}.'
@@ -159,15 +159,15 @@ def form_invalid(self, form, formsets):
             self.get_context_data(form=form, formsets=formsets))
 
     def save_topicassignment_formset_form(self, form):
-        if not form.cleaned_data['topic']:
+        if not form.cleaned_data['topic_qs']:
             return
         if form.instance and form.instance.id:
             return
-        if form.cleaned_data['topic'] in self.object.related_topics.all():
-            return
         ta = form.save(commit=False)
+        ta.topic = form.cleaned_data['topic_qs'].get(project__slug=self.project.slug)
+        if ta.topic in self.object.related_topics.all():
+            return
         ta.creator = self.request.user
-        ta.topic = form.cleaned_data['topic']
         ta.content_object = self.object
         ta.save()
         return ta

editorsnotes/admin_custom/views/topics.py

@@ -13,7 +13,7 @@ class TopicAdminView(BaseAdminView):
     form_class = forms.TopicForm
     formset_classes = (
         forms.topics.AlternateNameFormset,
-        # forms.TopicAssignmentFormset,
+        forms.common.TopicAssignmentFormset,
         forms.topics.CitationFormset,
     )
     template_name = 'topic_admin.html'

editorsnotes/main/templates/topic.html

@@ -19,11 +19,11 @@
     <header>
       <h2 id="topic-name">{{ topic.preferred_name }}</h2>
       <div class="related-topics">
-        {% if related_topics %}
+        {% if topic.related_topics.all %}
         <span class="quiet">Related topics:</span> 
         <ul class="topic-list">
-          {% for related_topic in related_topics %}
-          <li>{{ related_topic|as_link }}</a>{% if not forloop.last %} | {% endif %}</li>
+          {% for related_topic in topic.related_topics.all %}
+          <li>{{ related_topic.topic|as_link }}</a>{% if not forloop.last %} | {% endif %}</li>
           {% endfor %}
         </ul>
         {% endif %}

editorsnotes/main/views/topics.py

@@ -37,7 +37,8 @@ def topic_node(request, topic_node_id):
 def topic(request, project_slug, topic_node_id):
     o = {}
     topic_qs = Topic.objects.select_related('topic_node', 'creator',
-                                            'last_updater', 'project')
+                                            'last_updater', 'project')\
+            .prefetch_related('related_topics__topic')
     o['topic'] = topic = get_object_or_404(topic_qs,
                                            topic_node_id=topic_node_id,
                                            project__slug=project_slug)