Browse Source

Tweaks in indexing features.

Ralfp 12 years ago
parent
commit
fe9faddb22

+ 3 - 0
misago/apps/threadtype/posting/editthread.py

@@ -58,5 +58,8 @@ class EditThreadBaseView(PostingBaseView):
             self.md, self.post.post_preparsed = post_markdown(form.cleaned_data['post'])
             self.post.save(force_update=True)
 
+        if old_name != form.cleaned_data['thread_name']:
+            self.thread.update_current_dates()
+
         if changed_thread or changed_post:
             self.record_edit(form, old_name, old_post)

+ 1 - 0
misago/models/postmodel.py

@@ -118,6 +118,7 @@ class Post(models.Model):
 def rename_user_handler(sender, **kwargs):
     Post.objects.filter(user=sender).update(
                                             user_name=sender.username,
+                                            current_date=timezone.now(),
                                             )
     Post.objects.filter(edit_user=sender).update(
                                                  edit_user_name=sender.username,

+ 11 - 1
misago/search_indexes.py

@@ -3,7 +3,7 @@ from misago.models import Post
 
 class PostIndex(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
-    forum = indexes.CharField(model_attr='forum')
+    forum = indexes.IntegerField(model_attr='forum')
     thread = indexes.CharField(model_attr='thread')
     user = indexes.CharField(model_attr='user_name')
     date = indexes.DateTimeField(model_attr='date')
@@ -11,8 +11,18 @@ class PostIndex(indexes.SearchIndex, indexes.Indexable):
     def get_model(self):
         return Post
 
+    def prepare_thread(self, obj):
+        return thread.name
+
     def get_updated_field(self):
         return 'current_date'
 
+    def should_update(self, instance, **kwargs):
+        if (instance.deleted or instance.moderated
+                or instance.thread.deletedor instance.thread.moderated):
+            self.remove_object(instance, **kwargs)
+            return False
+        return True
+
     def index_queryset(self, using=None):
         return self.get_model().objects.all()