Some more cosmetics for the "all clusters for a single site" page. Bu…

…g 587616.

apps/website_issues/helpers.py

@@ -31,7 +31,7 @@ def sites_url(context, form, fragment_id=None, **kwargs):
     # If this is a single-site page, convert the site ID to search criteria.
     if form.cleaned_data['site'] and context['site']:
         del parameters['site']
-        if 'q' not in kwargs:
+        if 'q' not in kwargs and 'page' not in kwargs:
             parameters['q'] = context['site'].url
 
     parts = [reverse("website_issues")]

apps/website_issues/models.py

@@ -31,9 +31,7 @@ class Meta:
 
     @property
     def secondary_comments(self):
-        qs = self.comments.filter(
-            cluster=self).exclude(
-            pk=self.primary_comment_id)
+        qs = self.comments.exclude(pk=self.primary_comment_id)
         return qs
 
 

apps/website_issues/templates/website_issues/single_site.html

@@ -5,10 +5,11 @@ <h2>{{ site.url|without_protocol }}</h2>
 <ul class="themes">
   {% for cluster in page.object_list %}
   <li class="theme">
-  {# TODO smilies?
-  <p class="type praise" title="_('Praise')"><span>_('Praise')</span></p>
-  <p class="type issue" title="_('Issue')"><span>_('Issue')</span></p>
-  #}
+  {% if cluster.positive %}
+    <p class="type praise" title="_('Praise')"><span>_('Praise')</span></p>
+  {% else %}
+    <p class="type issue" title="_('Issue')"><span>_('Issue')</span></p>
+  {% endif %}
 
   <p class="primary"><a href="#">
     <span>{{ cluster.primary_description|as_unicode }}</span>