提交: a3d6d91c61bfcf84c1a114867cbaf8d1a485b2ef - allura (git)

allura

Commit MetaInfo

• 修訂: a3d6d91c61bfcf84c1a114867cbaf8d1a485b2ef (tree)
• 時間: 2011-07-15 05:53:48
• 作者: Dave Brondsema <dbrondsema@geek...>
• Commiter: Dave Brondsema

Log Message

[#2455] fix anonymous lookup when post author is not found

Signed-off-by: Dave Brondsema <[e-mail]>

Change Summary

• modified: Allura/allura/model/artifact.py
• modified: Allura/allura/tests/model/test_artifact.py
• modified: Allura/allura/tests/unit/test_app.py
• modified: ForgeBlog/forgeblog/model/blog.py

差異

--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -411,7 +411,7 @@ class Message(Artifact):
 
     def author(self):
         from .auth import User
-        return User.query.get(_id=self.author_id) or User.anonymous
+        return User.query.get(_id=self.author_id) or User.anonymous()
 
     def reply(self):
         new_id = h.gen_message_id()

--- a/Allura/allura/tests/model/test_artifact.py
+++ b/Allura/allura/tests/model/test_artifact.py
@@ -149,3 +149,11 @@ def test_messages():
     assert 'author_display_name_t' in idx
     assert 'timestamp_dt' in idx
     assert m.shorthand_id() == m.slug
+
+@with_setup(setUp, tearDown)
+def test_messages_unknown_lookup():
+    from bson import ObjectId
+    m = Checkmessage()
+    m.author_id = ObjectId() # something new
+    assert type(m.author()) == M.User, type(m.author())
+    assert m.author() == M.User.anonymous()

--- a/Allura/allura/tests/unit/test_app.py
+++ b/Allura/allura/tests/unit/test_app.py
@@ -48,7 +48,7 @@ class TestAppDefaults(WithDatabase):
         assert self.app.sidebar_menu() == []
 
     def test_that_it_denies_access_for_everything(self):
-        assert not self.app.has_access(model.User.anonymous, 'any.topic')
+        assert not self.app.has_access(model.User.anonymous(), 'any.topic')
 
 
 def install_app():

--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -64,7 +64,7 @@ class BlogPost(M.VersionedArtifact):
 
     def author(self):
         '''The author of the first snapshot of this BlogPost'''
-        return M.User.query.get(_id=self.get_version(1).author.id) or M.User.anonymous
+        return M.User.query.get(_id=self.get_version(1).author.id) or M.User.anonymous()
 
     def _get_date(self):
         return self.timestamp.date()