X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/867fd7fad5430361d308452a02905dc85458485e..0540b1d1e3bc54243ea1ecfcd09727809cef054a:/questions/views.py

diff --git a/questions/views.py b/questions/views.py
index 43b812b..25ec438 100644
--- a/questions/views.py
+++ b/questions/views.py
@@ -26,9 +26,12 @@ class QuestionListView(ListView):
         self.tag = None
         if 'tag' in request.GET:
             try:
-                self.tag = Tag.objects.filter(items__question__published=True, slug=request.GET['tag'])[0]
-            except IndexError:
+                tag = Tag.objects.get(slug=request.GET['tag'])
+                assert Question.objects.filter(tags=self.tag).exists()
+            except (Tag.DoesNotExist, AssertionError):
                 pass
+            else:
+                self.tag = tag
         return super(QuestionListView, self).get(request, *args, **kwargs)
 
     def get_queryset(self):
@@ -41,22 +44,39 @@ class QuestionListView(ListView):
         return qs
 
     def get_context_data(self, *args, **kwargs):
+        def get_cloud_size(clicks, relate_to):
+            return '%.2f' % (0.7 + (float(clicks) / relate_to if relate_to != 0 else 0))
+        
         context = super(QuestionListView, self).get_context_data(*args, **kwargs)
         context['tag'] = self.tag
         context['tag_categories'] = TagCategory.objects.all().annotate(click_count = models.Sum('tags__click_count'))
         context['tag_lists'] = dict()
         
-        tags = Tag.objects.filter(items__question__published=True
-            ).annotate(c=models.Count('items__tag')).order_by('category__slug', '-c', 'slug')
-        all_tag_clicks_count = Tag.objects.all().aggregate(models.Sum('click_count'))['click_count__sum']
         annotated_categories = dict()
-        minimum_factor = 0.7
+        all_tags_click_count = Tag.objects.all().aggregate(models.Sum('click_count'))['click_count__sum']
         for category in context['tag_categories']:
             annotated_categories[category.id] = category
-            category.factor =  '%.2f' % (minimum_factor + ((float(category.click_count) / all_tag_clicks_count) if all_tag_clicks_count else 0))
+            category.cloud_size =  get_cloud_size(category.click_count, all_tags_click_count)
+
+        # This wouldn't happen if we were using taggit without generic relations.
+        tags = Tag.objects.raw("""
+            SELECT t.category_id, t.click_count, t.id, t.name, t.slug, count(t.id) AS c
+            FROM questions_tag t
+            LEFT JOIN questions_tagcategory c ON c.id=t.category_id
+            LEFT JOIN questions_tagitem i ON i.tag_id=t.id
+            LEFT JOIN questions_question q ON q.id=i.object_id
+            WHERE q.published
+            GROUP BY t.category_id, t.click_count, t.id, t.name, t.slug, c.slug
+            ORDER BY c.slug, c DESC, t.slug
+            """)
+        uncategorized_tags_click_count = Tag.objects.filter(category=None).aggregate(models.Sum('click_count'))['click_count__sum']
         for tag in tags:
             if tag.category:
-                category = annotated_categories[tag.category.id]
-                tag.factor = '%.2f' % (minimum_factor + ((float(tag.click_count) / category.click_count) if category.click_count else 0))
+                category_click_count = annotated_categories[tag.category.id].click_count
+            else:
+                category_click_count = uncategorized_tags_click_count
+            tag.cloud_size = get_cloud_size(tag.click_count, category_click_count)
             context['tag_lists'].setdefault(tag.category.id if tag.category else 0, []).append(tag)
+        context['has_uncategorized_tags'] = 0 in context['tag_lists']
+
         return context