[#6056] Improved loading of discussion post by slug
Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index 4fa05c8..9ff5e6c 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -256,11 +256,12 @@
@LazyProperty
def post(self):
- result = self.M.Post.query.find(dict(slug=self._post_slug)).all()
- for p in result:
- if p.thread_id == self.thread._id: return p
- if result:
- redirect(result[0].url())
+ post = self.M.Post.query.get(slug=self._post_slug, thread_id=self.thread._id)
+ if post:
+ return post
+ post = self.M.Post.query.get(slug=self._post_slug)
+ if post:
+ return post
else:
redirect('..')
