You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/07/31 17:33:37 UTC
[1/7] git commit: [#6446] ticket:400 fixed test for showing only ok
posts
Updated Branches:
refs/heads/master 625bf2ec9 -> 8b994ee25
[#6446] ticket:400 fixed test for showing only ok posts
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/24cd410c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/24cd410c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/24cd410c
Branch: refs/heads/master
Commit: 24cd410cfe4d9a89541faa1ed4c6204b394cc081
Parents: 58a2727
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Mon Jul 22 16:31:34 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 31 14:55:48 2013 +0000
----------------------------------------------------------------------
.../forgediscussion/tests/functional/test_rest.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/24cd410c/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
index 3aca6e0..6c45a2a 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
@@ -24,6 +24,7 @@ from allura.tests import decorators as td
from allura import model as M
from alluratest.controller import TestRestApiBase
from forgediscussion.model import ForumThread
+from ming.orm import ThreadLocalORMSession
class TestDiscussionApiBase(TestRestApiBase):
@@ -186,9 +187,6 @@ class TestRootRestController(TestDiscussionApiBase):
assert_equal(resp.json['limit'], 1)
def test_topic_show_ok_only(self):
- # import logging
- # log = logging.getLogger(__name__)
-
thread = ForumThread.query.find({'subject': 'Hi guys'}).first()
url = '/rest/p/test/discussion/general/thread/%s/' % thread._id
resp = self.app.get(url)
@@ -198,12 +196,9 @@ class TestRootRestController(TestDiscussionApiBase):
last_post = thread.last_post
last_post.status = 'pending'
last_post.commit()
-
+ ThreadLocalORMSession.flush_all()
resp = self.app.get(url)
posts = resp.json['topic']['posts']
-
- # log.info('ready to debug')
- # log.info(posts)
assert_equal(len(posts), 1)
def test_security(self):
[5/7] git commit: [#6446] ticket:400 removed trailing whitespaces
Posted by tv...@apache.org.
[#6446] ticket:400 removed trailing whitespaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6436aa54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6436aa54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6436aa54
Branch: refs/heads/master
Commit: 6436aa54e610ca805edda2ef6e8287f8e5442e43
Parents: 0877d5c
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Wed Jul 24 17:35:59 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 31 14:55:49 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/discuss.py | 2 +-
ForgeDiscussion/forgediscussion/tests/functional/test_rest.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6436aa54/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index ee62778..d13b7e9 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -336,7 +336,7 @@ class Thread(Artifact, ActivityObject):
terms = dict(discussion_id=self.discussion_id, thread_id=self._id,
status={'$in': ['ok', 'pending']})
if status:
- terms['status'] = status
+ terms['status'] = status
q = self.post_class().query.find(terms)
if style == 'threaded':
q = q.sort('full_slug')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6436aa54/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
index 6c45a2a..afdcdc5 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
@@ -187,7 +187,7 @@ class TestRootRestController(TestDiscussionApiBase):
assert_equal(resp.json['limit'], 1)
def test_topic_show_ok_only(self):
- thread = ForumThread.query.find({'subject': 'Hi guys'}).first()
+ thread = ForumThread.query.find({'subject': 'Hi guys'}).first()
url = '/rest/p/test/discussion/general/thread/%s/' % thread._id
resp = self.app.get(url)
posts = resp.json['topic']['posts']
@@ -198,7 +198,7 @@ class TestRootRestController(TestDiscussionApiBase):
last_post.commit()
ThreadLocalORMSession.flush_all()
resp = self.app.get(url)
- posts = resp.json['topic']['posts']
+ posts = resp.json['topic']['posts']
assert_equal(len(posts), 1)
def test_security(self):
[3/7] git commit: [#6446] ticket:400 added filtering for topics in
api, test fail
Posted by tv...@apache.org.
[#6446] ticket:400 added filtering for topics in api, test fail
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/dbb1cb19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/dbb1cb19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/dbb1cb19
Branch: refs/heads/master
Commit: dbb1cb191586af7293303208115a83efb1e07829
Parents: 625bf2e
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Mon Jul 22 14:09:15 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 31 14:55:48 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/discuss.py | 4 +++-
.../forgediscussion/controllers/root.py | 2 +-
.../tests/functional/test_rest.py | 21 ++++++++++++++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dbb1cb19/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 76cf615..97d19d0 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -328,13 +328,15 @@ class Thread(Artifact, ActivityObject):
return result
def query_posts(self, page=None, limit=None,
- timestamp=None, style='threaded'):
+ timestamp=None, style='threaded', status=None):
if timestamp:
terms = dict(discussion_id=self.discussion_id, thread_id=self._id,
status={'$in': ['ok', 'pending']}, timestamp=timestamp)
else:
terms = dict(discussion_id=self.discussion_id, thread_id=self._id,
status={'$in': ['ok', 'pending']})
+ if status:
+ terms['status'] = status
q = self.post_class().query.find(terms)
if style == 'threaded':
q = q.sort('full_slug')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dbb1cb19/ForgeDiscussion/forgediscussion/controllers/root.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index 67e51ca..7dd18c7 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -334,7 +334,7 @@ class ForumTopicRestController(BaseController):
@expose('json:')
def index(self, limit=100, page=0, **kw):
limit, page, start = g.handle_paging(int(limit), int(page))
- posts = self.topic.query_posts(page=page, limit=limit, style='')
+ posts = self.topic.query_posts(page=page, limit=limit, style='', status='ok')
json = {}
json['topic'] = self.topic.__json__()
json['count'] = posts.count()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dbb1cb19/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
index 56c01ff..7fc3499 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
@@ -168,6 +168,27 @@ class TestRootRestController(TestDiscussionApiBase):
assert_equal(resp.json['page'], 1)
assert_equal(resp.json['limit'], 1)
+ def test_topic_show_ok_only(self):
+ # import logging
+ # log = logging.getLogger(__name__)
+
+ thread = ForumThread.query.find({'subject': 'Hi guys'}).first()
+ url = '/rest/p/test/discussion/general/thread/%s/' % thread._id
+ resp = self.app.get(url)
+ posts = resp.json['topic']['posts']
+ assert_equal(len(posts), 1)
+ thread.post('Hello', 'I am not ok post')
+ last_post = thread.last_post
+ last_post.status = 'pending'
+ last_post.commit()
+
+ resp = self.app.get(url)
+ posts = resp.json['topic']['posts']
+
+ # log.info('ready to debug')
+ # log.info(posts)
+ assert_equal(len(posts), 1)
+
def test_security(self):
p = M.Project.query.get(shortname='test')
acl = p.app_instance('discussion').config.acl
[2/7] git commit: [#6446] ticket:400 in forum api return only ok
threads
Posted by tv...@apache.org.
[#6446] ticket:400 in forum api return only ok threads
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/58a2727b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/58a2727b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/58a2727b
Branch: refs/heads/master
Commit: 58a2727bd9cf4af9644ecbc2188d7f5b88c52871
Parents: dbb1cb1
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Mon Jul 22 16:17:11 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 31 14:55:48 2013 +0000
----------------------------------------------------------------------
.../forgediscussion/controllers/root.py | 2 +-
.../forgediscussion/tests/functional/test_rest.py | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/58a2727b/ForgeDiscussion/forgediscussion/controllers/root.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py
index 7dd18c7..f4354cc 100644
--- a/ForgeDiscussion/forgediscussion/controllers/root.py
+++ b/ForgeDiscussion/forgediscussion/controllers/root.py
@@ -305,7 +305,7 @@ class ForumRestController(BaseController):
num_views=t.num_views,
url=h.absurl('/rest' + t.url()),
last_post=t.last_post)
- for t in topics]
+ for t in topics if t.status == 'ok']
json['count'] = count
json['page'] = page
json['limit'] = limit
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/58a2727b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
index 7fc3499..3aca6e0 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
@@ -104,6 +104,23 @@ class TestRootRestController(TestDiscussionApiBase):
url = 'http://localhost:80/rest/p/test/discussion/general/thread/%s/' % t._id
assert_equal(topics[1]['url'], url)
+ def test_forum_show_ok_topics(self):
+ forum = self.api_get('/rest/p/test/discussion/general/')
+ forum = forum.json['forum']
+ assert_equal(forum['name'], 'General Discussion')
+ topics = forum['topics']
+ assert_equal(len(topics), 2)
+ self.create_topic('general', 'Hi again', 'It should not be shown')
+ t = ForumThread.query.find({'subject': 'Hi again'}).first()
+ first_post = t.first_post
+ first_post.status = u'pending'
+ first_post.commit()
+ forum = self.api_get('/rest/p/test/discussion/general/')
+ forum = forum.json['forum']
+ assert_equal(forum['name'], 'General Discussion')
+ topics = forum['topics']
+ assert_equal(len(topics), 2)
+
def test_topic(self):
forum = self.api_get('/rest/p/test/discussion/general/')
forum = forum.json['forum']
[7/7] git commit: [#6446] ticket:400 fixed topics display in forum api
Posted by tv...@apache.org.
[#6446] ticket:400 fixed topics display in forum api
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/a7e25cc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/a7e25cc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/a7e25cc0
Branch: refs/heads/master
Commit: a7e25cc06604cecac7d3e3e268aae66364494bdc
Parents: 24cd410
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Wed Jul 24 11:24:58 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 31 14:55:49 2013 +0000
----------------------------------------------------------------------
ForgeDiscussion/forgediscussion/model/forum.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/a7e25cc0/ForgeDiscussion/forgediscussion/model/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/model/forum.py b/ForgeDiscussion/forgediscussion/model/forum.py
index b5206c6..42d1dc0 100644
--- a/ForgeDiscussion/forgediscussion/model/forum.py
+++ b/ForgeDiscussion/forgediscussion/model/forum.py
@@ -161,8 +161,8 @@ class ForumThread(M.Thread):
@property
def status(self):
- if self.first_post:
- return self.first_post.status
+ if len(self.posts) == 1:
+ return self.posts[0].status
else:
return 'ok'
[6/7] git commit: [#6446] ticket:400 removed threads from forum json
Posted by tv...@apache.org.
[#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/master
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,
[4/7] git commit: [#6446] ticket:400 do not show not ok posts for
other apis
Posted by tv...@apache.org.
[#6446] ticket:400 do not show not ok posts for other apis
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/0877d5c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/0877d5c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/0877d5c3
Branch: refs/heads/master
Commit: 0877d5c3e1dd3140229f36e7100b1d346b08ffea
Parents: a7e25cc
Author: Anton Kasyanov <mi...@gmail.com>
Authored: Wed Jul 24 11:47:10 2013 +0300
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 31 14:55:49 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/discuss.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/0877d5c3/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 97d19d0..ee62778 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -169,7 +169,7 @@ class Thread(Artifact, ActivityObject):
subject=p.subject,
attachments=[dict(bytes=attach.length,
url=h.absurl(attach.url())) for attach in p.attachments])
- for p in self.posts])
+ for p in self.posts if p.status == 'ok'])
@property
def activity_name(self):