You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/07/31 21:14:36 UTC
[16/23] git commit: [#6446] ticket:400 removed threads from forum json
[#6446] ticket:400 removed threads from forum json
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8b994ee2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8b994ee2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8b994ee2
Branch: refs/heads/cj/6461
Commit: 8b994ee25a10fe4f87cc898c506591c7b51fc71c
Parents: 6436aa5
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Wed Jul 24 17:47:55 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 31 14:55:49 2013 +0000
----------------------------------------------------------------------
ForgeDiscussion/forgediscussion/controllers/root.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8b994ee2/ForgeDiscussion/forgediscussion/controllers/root.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index f4354cc..fa0e97b 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -299,6 +299,8 @@ class ForumRestController(BaseController):
count = topics.count()
json = {}
json['forum'] = self.forum.__json__()
+ # it appears that topics replace threads here
+ del json['forum']['threads']
json['forum']['topics'] = [dict(_id=t._id,
subject=t.subject,
num_replies=t.num_replies,