From 9d09468af87c96aa47fb6e8d000e81ea457ba7c0 Mon Sep 17 00:00:00 2001 From: Mikhail Kolesnik Date: Wed, 5 Aug 2009 16:06:48 +0300 Subject: [PATCH 1/2] fixes submit_faq view by adding a topic field, see issue #3 --- faq/forms.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/faq/forms.py b/faq/forms.py index 1e5a393..03c8fef 100644 --- a/faq/forms.py +++ b/faq/forms.py @@ -8,10 +8,11 @@ import datetime from django import forms -from faq.models import Question +from faq.models import Question, Topic from faq.enums import STATUS_INACTIVE class SubmitFAQForm(forms.Form): + topic = forms.ModelChoiceField(queryset=Topic.objects.all(), empty_label=None) question = forms.CharField(max_length=512,min_length=4,widget=forms.Textarea) answer = forms.CharField(required=False,widget=forms.Textarea) @@ -27,8 +28,10 @@ def save(self, user=None): dt.hour, dt.minute, dt.second ) question = self.cleaned_data['question'] answer = self.cleaned_data['answer'] + topic = self.cleaned_data['topic'] new_question = Question( text=question, answer=answer, slug=slug_str, sort_order = 999, - protected = False, status = STATUS_INACTIVE ) + protected = False, status = STATUS_INACTIVE, + topic=topic ) return new_question From 67c9e635a35cb77253fa46592c03bf39822bd91e Mon Sep 17 00:00:00 2001 From: Mikhail Kolesnik Date: Tue, 10 Dec 2013 19:19:19 +0200 Subject: [PATCH 2/2] Fix import in urls.py for Django 1.6+ --- faq/urls.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/faq/urls.py b/faq/urls.py index 194cfe3..7f931bc 100644 --- a/faq/urls.py +++ b/faq/urls.py @@ -1,6 +1,8 @@ from __future__ import absolute_import - -from django.conf.urls.defaults import * +try: + from django.conf.urls import * +except ImportError: + from django.conf.urls.defaults import * from . import views as faq_views urlpatterns = patterns('',