Fixed build

misago/core/templatetags/misago_stringutils.py

@@ -6,4 +6,7 @@ register = template.Library()
 
 @register.filter
 def striplinebreaks(string):
-    return ' '.join([s.strip() for s in string.splitlines() if s.strip()])
+    if string:
+        return ' '.join([s.strip() for s in string.splitlines() if s.strip()])
+    else:
+        return ''

misago/forums/migrations/0001_initial.py

@@ -25,11 +25,9 @@ class Migration(migrations.Migration):
                 ('description_as_html', models.TextField(null=True, blank=True)),
                 ('is_closed', models.BooleanField(default=False)),
                 ('redirect_url', models.CharField(max_length=255, null=True, blank=True)),
-                ('redirects_count', models.PositiveIntegerField(default=0)),
+                ('redirects', models.PositiveIntegerField(default=0)),
                 ('threads', models.PositiveIntegerField(default=0)),
-                ('threads_count', models.PositiveIntegerField(default=0)),
                 ('posts', models.PositiveIntegerField(default=0)),
-                ('posts_count', models.PositiveIntegerField(default=0)),
                 ('prune_started_after', models.PositiveIntegerField(default=0)),
                 ('prune_replied_after', models.PositiveIntegerField(default=0)),
                 ('css_class', models.CharField(max_length=255, null=True, blank=True)),

misago/forums/models.py

@@ -61,11 +61,9 @@ class Forum(MPTTModel):
     description_as_html = models.TextField(null=True, blank=True)
     is_closed = models.BooleanField(default=False)
     redirect_url = models.CharField(max_length=255, null=True, blank=True)
-    redirects_count = models.PositiveIntegerField(default=0)
+    redirects = models.PositiveIntegerField(default=0)
     threads = models.PositiveIntegerField(default=0)
-    threads_count = models.PositiveIntegerField(default=0)
     posts = models.PositiveIntegerField(default=0)
-    posts_count = models.PositiveIntegerField(default=0)
     prune_started_after = models.PositiveIntegerField(default=0)
     prune_replied_after = models.PositiveIntegerField(default=0)
     archive_pruned_in = models.ForeignKey('self',

misago/forums/tests/test_forums_views.py

@@ -79,6 +79,15 @@ class RedirectViewsTests(AdminTestCase):
         redirects_qs = Forum.objects.all_forums().filter(role='redirect')
         self.redirect = redirects_qs[:1][0]
 
+    def allow_redirect_follow(self):
+        override_acl(self.test_admin, {
+            'visible_forums': [self.redirect.parent_id, self.redirect.pk],
+            'forums': {
+                self.redirect.parent_id: {'can_see': 1, 'can_browse': 1},
+                self.redirect.pk: {'can_see': 1, 'can_browse': 1},
+            }
+        })
+
     def test_cant_see_redirect(self):
         """can't see redirect"""
         override_acl(self.test_admin, {'visible_forums': []})
@@ -88,29 +97,21 @@ class RedirectViewsTests(AdminTestCase):
 
     def test_can_follow_redirect(self):
         """can see redirect"""
-        override_acl(self.test_admin, {
-            'visible_forums': [self.redirect.parent_id, self.redirect.pk],
-            'forums': {
-                self.redirect.parent_id: {'can_see': 1, 'can_browse': 1},
-                self.redirect.pk: {'can_see': 1, 'can_browse': 1},
-            }
-        })
-
+        self.allow_redirect_follow()
         response = self.client.get(self.redirect.get_absolute_url())
         self.assertEqual(response.status_code, 302)
         self.assertEqual(response['location'], 'http://misago-project.org')
 
         # Redirects count increased
         updated_redirect = Forum.objects.get(id=self.redirect.pk)
-        self.assertEqual(updated_redirect.redirects_count,
-                         self.redirect.redirects_count + 1)
+        self.assertEqual(updated_redirect.redirects,
+                         self.redirect.redirects + 1)
 
         # Session keeps track of clicks spam
-        self.client.get(self.redirect.get_absolute_url())
-        self.client.get(self.redirect.get_absolute_url())
-        self.client.get(self.redirect.get_absolute_url())
-        self.client.get(self.redirect.get_absolute_url())
+        for i in xrange(20):
+            self.allow_redirect_follow()
+            self.client.get(self.redirect.get_absolute_url())
 
         updated_redirect = Forum.objects.get(id=self.redirect.pk)
-        self.assertEqual(updated_redirect.redirects_count,
-                         self.redirect.redirects_count + 1)
+        self.assertEqual(updated_redirect.redirects,
+                         self.redirect.redirects + 1)

misago/forums/views/__init__.py

@@ -40,8 +40,8 @@ def category(request, forum):
 def redirect(request, forum):
     if forum.pk not in request.session.get('forum_redirects', []):
         request.session.setdefault('forum_redirects', []).append(forum.pk)
-        forum.redirects_count = F('redirects_count') + 1
-        forum.save(update_fields=['redirects_count'])
+        forum.redirects = F('redirects') + 1
+        forum.save(update_fields=['redirects'])
     return dj_redirect(forum.redirect_url)
 
 

misago/templates/misago/forums/forums.html

@@ -17,7 +17,7 @@
       <ul class="list-unstyled">
         {% if forum.role == 'redirect' %}
         <li>
-          {% trans "Clicks:" %} <strong>{{ forum.redirects_count|intcomma }}</strong>
+          {% trans "Clicks:" %} <strong>{{ forum.redirects|intcomma }}</strong>
         </li>
         {% elif forum.acl.can_browse %}
         <li>
@@ -38,8 +38,8 @@
       {% if forum.role == 'redirect' %}
       <a href="{{ forum.get_absolute_url }}" class="item-title">{{ forum.redirect_host }}</a>
       <div class="text-muted">
-        {% capture as clicks %}<strong>{{ forum.redirects_count|intcomma }}</strong>{% endcapture %}
-        {% blocktrans trimmed with clicks=clicks|safe count counter=forum.redirects_count %}
+        {% capture as clicks %}<strong>{{ forum.redirects|intcomma }}</strong>{% endcapture %}
+        {% blocktrans trimmed with clicks=clicks|safe count counter=forum.redirects %}
         {{ clicks }} click
         {% plural %}
         {{ clicks }} clicks