adding question list tags, login redirect instead of 404 (closes #30) and can_view on prefetch_related (closes #31)

Author: bryanhelmig

knowledge/managers.py

@@ -3,6 +3,9 @@
 
 
 class QuestionManager(models.Manager):
+    # def get_query_set(self, *args, **kwargs):
+    #     return super(QuestionManager, self).get_query_set(*args, **kwargs)
+
     def can_view(self, user):
         qs = super(QuestionManager, self).get_query_set()\
                                          .select_related('user')
@@ -19,9 +22,13 @@ def can_view(self, user):
 
 
 class ResponseManager(models.Manager):
+    # def all(self, *args, **kwargs):
+    #     return super(ResponseManager, self).all(*args, **kwargs)\
+    #                                        .select_related('question', 'user')
+
     def can_view(self, user):
         qs = super(ResponseManager, self).get_query_set()\
-                            .select_related('question', 'user')
+                                         .select_related('question', 'user')
 
         if user.is_staff or user.is_superuser:
             return qs.all()

knowledge/models.py

@@ -140,6 +140,7 @@ def internal(self, save=True):
 
 class Question(KnowledgeBase):
     is_question = True
+    _requesting_user = None
 
     title = models.CharField(max_length=255,
         verbose_name=_('Question'),
@@ -193,8 +194,9 @@ def lock(self, save=True):
     ###################
 
     def get_responses(self, user=None):
+        user = user or self._requesting_user
         if user:
-            return Response.objects.can_view(user).filter(question=self)
+            return [r for r in self.responses.all() if r.can_view(user)]
         else:
             return self.responses.all()
 

knowledge/templates/django_knowledge/index.html

@@ -9,11 +9,8 @@
 <div class="dk-widget">
   <h3>{% blocktrans with count=questions|length %}Top {{ count }} Questions{% endblocktrans %}</h3>
   <hr />
-  <ol class="question-list">
-    {% for question in questions %}
-      <li><a href="{{ question.get_absolute_url }}">{{ question.title }}</a> <small class="quiet">&nbsp;by {{ question.get_name }}</small></li>
-    {% endfor %}
-  </ol>
+
+  {% include 'django_knowledge/question_list.html' %}
 </div>
 
 {% endblock knowledge_widgets %}

knowledge/templates/django_knowledge/list.html

@@ -12,11 +12,9 @@
   {# dunno how to do translation on this nasty block... #}
   <h3>Showing {{ counter }} results{% if search %} for <em>{{ search }}</em>{% endif %}{% if category %} in <em>{{ category.title }}</em> category{% endif %}:</h3>
   <hr />
-  <ol class="question-list">
-    {% for question in questions.object_list %}
-      <li><a href="{{ question.get_absolute_url }}">{{ question.title }}</a> <small class="quiet">&nbsp;by {{ question.get_name }}</small></li>
-    {% endfor %}
-  </ol>
+
+  {% include 'django_knowledge/question_list.html' with questions=questions.object_list %}
+
 
   {% if not questions.paginator.count %}
     <p class="center"><em>{% trans "No results found." %}</em></p>

knowledge/templates/django_knowledge/question_list.html

@@ -0,0 +1,7 @@
+{% load i18n %}
+
+<ol class="question-list">
+  {% for question in questions %}
+    <li><a href="{{ question.get_absolute_url }}">{{ question.title }}</a>&nbsp; {% if not question.get_responses %}<span class="dk-label dk-label-important">{% trans "no responses" %}</span>{% else %}<span class="dk-label">{{ question.get_responses|length }} responses</span>{% endif %}&nbsp; {% if question.accepted %}<span class="dk-label dk-label-warning">{% trans "accepted" %}</span>&nbsp;{% endif %} <small class="quiet">by {{ question.get_name }}</small></li>
+  {% endfor %}
+</ol>

knowledge/views.py

@@ -1,3 +1,5 @@
+import settings
+
 from django.http import Http404
 from django.shortcuts import render, redirect, get_object_or_404
 from django.core.urlresolvers import reverse, NoReverseMatch
@@ -27,13 +29,16 @@ def get_my_questions(request):
         return None
     else:
         return Question.objects.can_view(request.user)\
-                                    .filter(user=request.user)
+                               .filter(user=request.user)
 
 
 def knowledge_index(request,
                     template='django_knowledge/index.html'):
 
-    questions = Question.objects.can_view(request.user)[0:20]
+    questions = Question.objects.can_view(request.user)\
+                                .prefetch_related('responses__question')[0:20]
+    # this is for get_responses()
+    [setattr(q, '_requesting_user', request.user) for q in questions]
 
     return render(request, template, {
         'request': request,
@@ -49,7 +54,8 @@ def knowledge_list(request,
                    Form=QuestionForm):
 
     search = request.GET.get('title', None)
-    questions = Question.objects.can_view(request.user)
+    questions = Question.objects.can_view(request.user)\
+                                .prefetch_related('responses__question')
 
     if search:
         questions = questions.filter(
@@ -61,8 +67,11 @@ def knowledge_list(request,
         category = get_object_or_404(Category, slug=category_slug)
         questions = questions.filter(categories=category)
 
-    paginator, questions = paginate(questions, 50,
-            request.GET.get('page', '1'))
+    paginator, questions = paginate(questions,
+                                    50,
+                                    request.GET.get('page', '1'))
+    # this is for get_responses()
+    [setattr(q, '_requesting_user', request.user) for q in questions]
 
     return render(request, template, {
         'request': request,
@@ -80,10 +89,16 @@ def knowledge_thread(request,
                      slug=None,
                      template='django_knowledge/thread.html',
                      Form=ResponseForm):
-
-    question = get_object_or_404(
-        Question.objects.can_view(request.user),
-        id=question_id)
+    
+    try:
+        question = Question.objects.can_view(request.user)\
+                                   .get(id=question_id)
+    except Question.DoesNotExist:
+        if Question.objects.filter(id=question_id).exists() and \
+                                hasattr(settings, 'LOGIN_REDIRECT_URL'):
+            return redirect(settings.LOGIN_REDIRECT_URL)
+        else:
+            raise Http404
 
     responses = question.get_responses(request.user)
 

setup.py

@@ -12,7 +12,7 @@
     author = 'Bryan Helmig',
     author_email = '[email protected]',
     url = 'http://github.com/zapier/django-knowledge',
-    install_requires=['Markdown>=2.1.1',],
+    install_requires=['Markdown>=2.1.1','Django>=1.4'],
     packages=['knowledge'],
     package_data={'knowledge': [
       'migrations/*.py',

tests/settings.py

@@ -52,4 +52,6 @@
 
 TEMPLATE_DIRS = (
     os.path.join(DIRNAME, 'templates').replace('\\','/')
-)
+)
+
+LOGIN_REDIRECT_URL = '/admin/'