Ralfp 12 лет назад
Родитель
Сommit
eeea86b4db

+ 3 - 2
misago/apps/threadtype/thread/moderation/forms.py

@@ -2,9 +2,10 @@ from django import forms
 from django.http import Http404
 from django.utils.translation import ugettext_lazy as _
 from misago.acl.exceptions import ACLError403, ACLError404
-from misago.apps.threadtype.mixins import ValidateThreadNameMixin
-from misago.forms import Form
+from misago.forms import Form, ForumChoiceField
+from misago.models import Thread
 from misago.validators import validate_sluggable
+from misago.apps.threadtype.mixins import ValidateThreadNameMixin
 
 class SplitThreadForm(Form, ValidateThreadNameMixin):
     def finalize_form(self):

+ 3 - 3
misago/apps/threadtype/thread/views.py

@@ -66,11 +66,11 @@ class ThreadBaseView(ViewBase):
             post.ignored = self.thread.start_post_id != post.pk and not self.thread.pk in self.request.session.get('unignore_threads', []) and post.user_id in ignored_users
             if post.ignored:
                 self.ignored = True
-            post.checkpoints = []
-            if post.checkpoint_set.all():
+            post.checkpoints_visible = []
+            if post.checkpoints_set.all():
                 for checkpoint in post.checkpoint_set.all():
                     if self.request.acl.threads.can_see_checkpoint(self.forum, checkpoint):
-                        post.checkpoints.append(checkpoint)
+                        post.checkpoints_visible.append(checkpoint)
 
         last_post = self.posts[len(self.posts) - 1]
 

+ 2 - 2
templates/cranefly/private_threads/thread.html

@@ -298,9 +298,9 @@
           {% endif %}
         </div>
 
-        {% if post.checkpoint_set.all() %}
+        {% if post.checkpoints_visible %}
         <div class="post-checkpoints">
-          {% for checkpoint in post.checkpoint_set.all() %}
+          {% for checkpoint in post.checkpoints_visible %}
           <div class="post-checkpoint">
             <hr>
             <span>

+ 2 - 2
templates/cranefly/threads/thread.html

@@ -324,9 +324,9 @@
       {% endif %}
     </div>
 
-    {% if post.checkpoints %}
+    {% if post.checkpoints_visible %}
     <div class="post-checkpoints">
-      {% for checkpoint in post.checkpoints %}
+      {% for checkpoint in post.checkpoints_visible %}
       <div class="post-checkpoint{% if checkpoint.deleted %} checkpoint-deleted{% endif %}">
         <hr>
         <span>