This is an automated email from the ASF dual-hosted git repository.
kentontaylor pushed a commit to branch kt/4359
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/kt/4359 by this push:
new ecc0f7c fixup! [#4359]
ecc0f7c is described below
commit ecc0f7ce8fe0635fedf3e1c44ec1e1aed6b454ce
Author: Kenton Taylor <[email protected]>
AuthorDate: Tue Mar 29 16:36:35 2022 +0000
fixup! [#4359]
---
Allura/allura/model/discuss.py | 8 +++-----
Allura/allura/model/notification.py | 1 -
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 65f5a39..6b9e738 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -436,11 +436,9 @@ class Thread(Artifact, ActivityObject):
def find_posts(self, page=None, limit=None, timestamp=None,
style='threaded'):
- if self.posts:
- return self.posts
- else:
- return self.query_posts(page=page, limit=limit,
- timestamp=timestamp, style=style).all()
+ posts = self.query_posts(page=page, limit=limit,
+ timestamp=timestamp, style=style).all()
+ return posts
def url(self):
# Can't use self.discussion because it might change during the req
diff --git a/Allura/allura/model/notification.py
b/Allura/allura/model/notification.py
index 02cc77d..a1f9872 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -516,7 +516,6 @@ class Mailbox(MappedClass):
artifact_index_id=artifact_index_id,
topic=topic))
- @memoize
@classmethod
def subscribed(
cls, user_id=None, project_id=None, app_config_id=None,
