Просмотр исходного кода

Some tweaks to keep DB usage low.

Ralfp 12 лет назад
Родитель
Сommit
dc692e5c1e
3 измененных файлов с 5 добавлено и 4 удалено
  1. 2 2
      misago/forums/models.py
  2. 2 1
      misago/threads/views/list.py
  3. 1 1
      templates/sora/threads/thread.html

+ 2 - 2
misago/forums/models.py

@@ -40,11 +40,11 @@ class ForumManager(models.Manager):
                         parents[forum.parent_id].is_read = False
                     # Sum stats
                     if forum.last_thread_date and (not parents[forum.parent_id].last_thread_date or forum.last_thread_date > parents[forum.parent_id].last_thread_date):
-                        parents[forum.parent_id].last_thread = forum.last_thread
+                        parents[forum.parent_id].last_thread_id = forum.last_thread_id
                         parents[forum.parent_id].last_thread_name = forum.last_thread_name
                         parents[forum.parent_id].last_thread_slug = forum.last_thread_slug
                         parents[forum.parent_id].last_thread_date = forum.last_thread_date
-                        parents[forum.parent_id].last_poster = forum.last_poster
+                        parents[forum.parent_id].last_poster_id = forum.last_poster_id
                         parents[forum.parent_id].last_poster_name = forum.last_poster_name
                         parents[forum.parent_id].last_poster_slug = forum.last_poster_slug
                         parents[forum.parent_id].last_poster_style = forum.last_poster_style

+ 2 - 1
misago/threads/views/list.py

@@ -15,7 +15,8 @@ class ThreadsView(BaseView):
         self.forum = Forum.objects.get(pk=forum, type='forum')
         self.request.acl.forums.allow_forum_view(self.forum)
         self.parents = self.forum.get_ancestors().filter(level__gt=1)
-        self.forum.subforums = Forum.objects.treelist(self.request.acl.forums, self.forum, tracker=ForumsTracker(self.request.user))
+        if self.forum.lft + 1 != self.forum.rght:
+            self.forum.subforums = Forum.objects.treelist(self.request.acl.forums, self.forum, tracker=ForumsTracker(self.request.user))
         self.tracker = ThreadsTracker(self.request.user, self.forum)
                 
     def fetch_threads(self, page):

+ 1 - 1
templates/sora/threads/thread.html

@@ -21,7 +21,7 @@
   <h1>{{ thread.name }}</h1>
   <ul class="unstyled thread-info">
     <li><i class="icon-time"></i> {{ thread.last|reltimesince }}</li>
-    <li><i class="icon-user"></i> {% if thread.start_poster %}<a href="{% url 'user' user=thread.start_poster_id, username=thread.start_poster_slug %}">{{ thread.start_poster_name }}</a>{% else %}{{ thread.start_poster_name }}{% endif %}</li>
+    <li><i class="icon-user"></i> {% if thread.start_poster_id %}<a href="{% url 'user' user=thread.start_poster_id, username=thread.start_poster_slug %}">{{ thread.start_poster_name }}</a>{% else %}{{ thread.start_poster_name }}{% endif %}</li>
     <li><i class="icon-comment"></i> {% if thread.replies > 0 -%}
       {% trans count=thread.replies, replies=thread.replies|intcomma %}One reply{% pluralize %}{{ replies }} replies{% endtrans %}
     {%- else -%}