diff --git a/last_commit.txt b/last_commit.txt index a2c8c73f66..a9b9d10871 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,53 +1,34 @@ -Repository: plone.app.layout +Repository: Products.CMFEditions Branch: refs/heads/master -Date: 2022-09-18T20:21:26+02:00 -Author: Mikel Larreategi (erral) -Commit: https://github.com/plone/plone.app.layout/commit/ce2eec154b8aa5dfa3ad4e4d7a7775ee6695eee8 +Date: 2022-09-19T11:00:34-07:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/Products.CMFEditions/commit/13b7ef6923283922d635d741027bf07f6a87a2a2 -show full datetime +Avoid extra ObjectModifiedEvent on revert Files changed: -A news/325.bugfix -M plone/app/layout/viewlets/menu.pt +A news/90.bugfix +M Products/CMFEditions/CopyModifyMergeRepositoryTool.py -b'diff --git a/news/325.bugfix b/news/325.bugfix\nnew file mode 100644\nindex 00000000..3b83ceff\n--- /dev/null\n+++ b/news/325.bugfix\n@@ -0,0 +1,2 @@\n+Show modification datetime in toolbar with full datetime according to locale format\n+[erral]\ndiff --git a/plone/app/layout/viewlets/menu.pt b/plone/app/layout/viewlets/menu.pt\nindex 64958e1f..13c66cc0 100644\n--- a/plone/app/layout/viewlets/menu.pt\n+++ b/plone/app/layout/viewlets/menu.pt\n@@ -23,7 +23,7 @@\n \n ${context/ModificationDate}\n \n' +b'diff --git a/Products/CMFEditions/CopyModifyMergeRepositoryTool.py b/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\nindex 73f386f..3fe4ff6 100644\n--- a/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\n+++ b/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\n@@ -54,9 +54,7 @@\n from Products.CMFEditions.utilities import wrap\n from Products.CMFEditions.VersionPolicies import VersionPolicy\n from ZODB.broken import Broken\n-from zope.event import notify\n from zope.interface import implementer\n-from zope.lifecycleevent import ObjectModifiedEvent\n \n import logging\n import time\n@@ -670,8 +668,8 @@ def _fixupCatalogData(self, obj):\n """Reindex the object, otherwise the catalog will certainly\n be out of sync."""\n portal_catalog = getToolByName(self, "portal_catalog")\n+ # Note: this notifies an ObjectModifiedEvent as a side effect.\n portal_catalog.indexObject(obj)\n- notify(ObjectModifiedEvent(obj))\n # XXX: In theory we should probably be emitting IObjectMoved event\n # here as it is a possible consequence of a revert.\n # Perhaps in our current meager z2 existence we should do\ndiff --git a/news/90.bugfix b/news/90.bugfix\nnew file mode 100644\nindex 0000000..c6f6893\n--- /dev/null\n+++ b/news/90.bugfix\n@@ -0,0 +1 @@\n+- Only fire ObjectModifiedEvent once when an item is reverted to an old version. [davisagli]\n' -Repository: plone.app.layout +Repository: Products.CMFEditions Branch: refs/heads/master -Date: 2022-09-19T12:57:11+02:00 -Author: Jens W. Klein (jensens) -Commit: https://github.com/plone/plone.app.layout/commit/6d519ad61c90442cf79b12148e07c3f49ebff6a5 +Date: 2022-09-19T11:52:03-07:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/Products.CMFEditions/commit/68c559592a7fe5c4241a6d3ddf796deb69e753fb -Merge branch 'master' into erral-issue-325 +Merge pull request #91 from plone/fix-extra-version-on-revert -Files changed: -A news/327.bugfix -M plone/app/layout/testing.py -M plone/app/layout/viewlets/tests/history.txt -M plone/app/layout/viewlets/tests/test_content.py -M plone/app/layout/viewlets/tests/test_history.py - -b'diff --git a/news/327.bugfix b/news/327.bugfix\nnew file mode 100644\nindex 00000000..2d767944\n--- /dev/null\n+++ b/news/327.bugfix\n@@ -0,0 +1 @@\n+- Use longer password in tests. [davisagli]\ndiff --git a/plone/app/layout/testing.py b/plone/app/layout/testing.py\nindex 3974d941..0c95f1cd 100644\n--- a/plone/app/layout/testing.py\n+++ b/plone/app/layout/testing.py\n@@ -3,6 +3,7 @@\n from plone.app.testing import IntegrationTesting\n from plone.app.testing import PloneSandboxLayer\n from plone.app.testing import TEST_USER_ID\n+from plone.app.testing import TEST_USER_PASSWORD\n from Products.CMFPlone.utils import _createObjectByType\n \n \ndiff --git a/plone/app/layout/viewlets/tests/history.txt b/plone/app/layout/viewlets/tests/history.txt\nindex b195c103..bc7eaf3d 100644\n--- a/plone/app/layout/viewlets/tests/history.txt\n+++ b/plone/app/layout/viewlets/tests/history.txt\n@@ -11,9 +11,10 @@ Open a browser logged in as a Manager.\n \n >>> app = layer[\'app\']\n >>> from plone.testing.zope import Browser\n+ >>> from plone.app.testing import TEST_USER_PASSWORD\n >>> browser = Browser(app)\n >>> browser.handleErrors = False\n- >>> browser.addHeader(\'Authorization\', \'Basic admin:secret\')\n+ >>> browser.addHeader(\'Authorization\', f\'Basic admin:{TEST_USER_PASSWORD}\')\n >>> portal_url = \'http://nohost/plone\'\n \n By default, only HTTP error codes (e.g. 500 Server Side Error) are shown when an\ndiff --git a/plone/app/layout/viewlets/tests/test_content.py b/plone/app/layout/viewlets/tests/test_content.py\nindex cb8f6201..eae647f5 100644\n--- a/plone/app/layout/viewlets/tests/test_content.py\n+++ b/plone/app/layout/viewlets/tests/test_content.py\n@@ -6,6 +6,7 @@\n from plone.app.testing import logout\n from plone.app.testing import setRoles\n from plone.app.testing import TEST_USER_ID\n+from plone.app.testing import TEST_USER_PASSWORD\n from plone.locking.interfaces import ILockable\n from plone.registry.interfaces import IRegistry\n from plone.base.interfaces import ISecuritySchema\n@@ -70,7 +71,7 @@ def test_get_url_path(self):\n \n # users with a slash in the userid will have a different URL\n portal_membership = getToolByName(self.portal, "portal_membership")\n- portal_membership.addMember("foo/bar", "secret", ["Member"], "")\n+ portal_membership.addMember("foo/bar", TEST_USER_PASSWORD, ["Member"], "")\n self.assertEqual(viewlet.get_url_path("foo/bar"), "author/?author=foo%2Fbar")\n \n def test_get_fullname(self):\n@@ -83,7 +84,7 @@ def test_get_fullname(self):\n # otherwise we will return the fullname property\n portal_membership = getToolByName(self.portal, "portal_membership")\n portal_membership.addMember(\n- "foo/bar", "secret", ["Member"], "", properties={"fullname": "Foo Bar"}\n+ "foo/bar", TEST_USER_PASSWORD, ["Member"], "", properties={"fullname": "Foo Bar"}\n )\n self.assertEqual(viewlet.get_fullname("foo/bar"), "Foo Bar")\n \ndiff --git a/plone/app/layout/viewlets/tests/test_history.py b/plone/app/layout/viewlets/tests/test_history.py\nindex cf81fcfc..9add9c8c 100644\n--- a/plone/app/layout/viewlets/tests/test_history.py\n+++ b/plone/app/layout/viewlets/tests/test_history.py\n@@ -6,6 +6,7 @@\n from plone.app.testing import setRoles\n from plone.app.testing import TEST_USER_ID\n from plone.app.testing import TEST_USER_NAME\n+from plone.app.testing import TEST_USER_PASSWORD\n \n \n class TestWorkflowHistoryViewlet(ViewletsFunctionalTestCase):\n@@ -16,7 +17,7 @@ def setUp(self):\n self.folder.invokeFactory("Document", "d1")\n \n def addMember(self, username, roles=("Member",)):\n- self.portal.portal_membership.addMember(username, "secret", roles, [])\n+ self.portal.portal_membership.addMember(username, TEST_USER_PASSWORD, roles, [])\n \n def delMember(self, username):\n self.portal.portal_membership.deleteMembers([username])\n' - -Repository: plone.app.layout - - -Branch: refs/heads/master -Date: 2022-09-19T13:12:32-03:00 -Author: Franco Pellegrini (frapell) -Commit: https://github.com/plone/plone.app.layout/commit/223a9b7ce0cf83042857f91a3a1c6edeb14577a2 - -Merge pull request #326 from plone/erral-issue-325 - -show full datetime in toolbar modification time +Avoid extra ObjectModifiedEvent on revert Files changed: -A news/325.bugfix -M plone/app/layout/viewlets/menu.pt +A news/90.bugfix +M Products/CMFEditions/CopyModifyMergeRepositoryTool.py -b'diff --git a/news/325.bugfix b/news/325.bugfix\nnew file mode 100644\nindex 00000000..3b83ceff\n--- /dev/null\n+++ b/news/325.bugfix\n@@ -0,0 +1,2 @@\n+Show modification datetime in toolbar with full datetime according to locale format\n+[erral]\ndiff --git a/plone/app/layout/viewlets/menu.pt b/plone/app/layout/viewlets/menu.pt\nindex 64958e1f..13c66cc0 100644\n--- a/plone/app/layout/viewlets/menu.pt\n+++ b/plone/app/layout/viewlets/menu.pt\n@@ -23,7 +23,7 @@\n \n ${context/ModificationDate}\n \n' +b'diff --git a/Products/CMFEditions/CopyModifyMergeRepositoryTool.py b/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\nindex 73f386f..3fe4ff6 100644\n--- a/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\n+++ b/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\n@@ -54,9 +54,7 @@\n from Products.CMFEditions.utilities import wrap\n from Products.CMFEditions.VersionPolicies import VersionPolicy\n from ZODB.broken import Broken\n-from zope.event import notify\n from zope.interface import implementer\n-from zope.lifecycleevent import ObjectModifiedEvent\n \n import logging\n import time\n@@ -670,8 +668,8 @@ def _fixupCatalogData(self, obj):\n """Reindex the object, otherwise the catalog will certainly\n be out of sync."""\n portal_catalog = getToolByName(self, "portal_catalog")\n+ # Note: this notifies an ObjectModifiedEvent as a side effect.\n portal_catalog.indexObject(obj)\n- notify(ObjectModifiedEvent(obj))\n # XXX: In theory we should probably be emitting IObjectMoved event\n # here as it is a possible consequence of a revert.\n # Perhaps in our current meager z2 existence we should do\ndiff --git a/news/90.bugfix b/news/90.bugfix\nnew file mode 100644\nindex 0000000..c6f6893\n--- /dev/null\n+++ b/news/90.bugfix\n@@ -0,0 +1 @@\n+- Only fire ObjectModifiedEvent once when an item is reverted to an old version. [davisagli]\n'