ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use correct date when indexing. Update comment indexes to use America/Los_Angeles

Browse Source
This commit is contained in:
Jon Pentland 2022-10-24 23:43:35 +02:00
parent c5f17dc5e8
commit aa38be3ac2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plone/app/discussion/catalog.py
View File

@ -109,7 +109,7 @@ def effective(object):
@indexer(IComment) @indexer(IComment)
def created(object): def created(object):
# the catalog index needs Zope DateTime instead of Python datetime # the catalog index needs Zope DateTime instead of Python datetime
return DT(object.modification_date) return DT(object.creation_date)
@indexer(IComment) @indexer(IComment)

16
plone/app/discussion/tests/test_indexers.py
View File

@ -137,18 +137,18 @@ class CommentIndexersTest(unittest.TestCase):
# Set the portal timezone to something non-utc # Set the portal timezone to something non-utc
reg_key = "plone.portal_timezone" reg_key = "plone.portal_timezone"
registry = getUtility(IRegistry) registry = getUtility(IRegistry)
registry[reg_key] = "Europe/Berlin" registry[reg_key] = "America/Los_Angeles"
comment = createObject("plone.Comment") comment = createObject("plone.Comment")
comment.text = "Lorem ipsum dolor sit amet." comment.text = "Lorem ipsum dolor sit amet."
comment.creator = "jim" comment.creator = "jim"
comment.author_name = "Jim" comment.author_name = "Jim"
# Create date in CEST (ie not daylight savings = UTC+2) # Create date in PDT (ie daylight savings)
comment.creation_date = datetime(2006, 9, 17, 14, 18, 12).replace(tzinfo=tz.gettz("Europe/Berlin")) comment.creation_date = datetime(2006, 9, 17, 14, 18, 12).replace(tzinfo=tz.gettz("America/Los_Angeles"))
# Create date in CET (ie daylight savings = UTC+1) # Create date in PST (ie not daylight savings)
comment.modification_date = datetime(2008, 3, 12, 7, 32, 52).replace(tzinfo=tz.gettz("Europe/Berlin")) comment.modification_date = datetime(2008, 2, 12, 7, 32, 52).replace(tzinfo=tz.gettz("America/Los_Angeles"))
self.comment_id = conversation.addComment(comment) self.comment_id = conversation.addComment(comment)
self.comment = comment.__of__(conversation) self.comment = comment.__of__(conversation)
@ -182,15 +182,15 @@ class CommentIndexersTest(unittest.TestCase):
# Test if created, modified, effective etc. are set correctly # Test if created, modified, effective etc. are set correctly
self.assertEqual( self.assertEqual(
catalog.created(self.comment)(), catalog.created(self.comment)(),
DateTime(2006, 9, 17, 14, 18, 12, "GMT+2"), DateTime(2006, 9, 17, 14, 18, 12, "America/Los_Angeles"),
) )
self.assertEqual( self.assertEqual(
catalog.effective(self.comment)(), catalog.effective(self.comment)(),
DateTime(2006, 9, 17, 14, 18, 12, "GMT+2"), DateTime(2006, 9, 17, 14, 18, 12, "America/Los_Angeles"),
) )
self.assertEqual( self.assertEqual(
catalog.modified(self.comment)(), catalog.modified(self.comment)(),
DateTime(2008, 3, 12, 7, 32, 52, "GMT+1"), DateTime(2008, 2, 12, 7, 32, 52, "America/Los_Angeles"),
) )
def test_searchable_text(self): def test_searchable_text(self):