Skip to content

Commit

Permalink
[fc] Repository: plone.dexterity
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2019-03-26T23:40:40+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.dexterity@6fa7b32

Fixed DeprecationWarning for ObjectEvent.

Files changed:
A news/96.bugfix
M plone/dexterity/events.py
Repository: plone.dexterity

Branch: refs/heads/master
Date: 2019-04-02T18:17:03+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: plone/plone.dexterity@b511d70

Merge pull request #97 from plone/maurits-issue-96-deprecation

Fixed DeprecationWarning for ObjectEvent.

Files changed:
A news/96.bugfix
M plone/dexterity/events.py
  • Loading branch information
mauritsvanrees committed Apr 2, 2019
1 parent a1454fe commit 288b9ab
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
Repository: plone.app.contenttypes
Repository: plone.dexterity


Branch: refs/heads/master
Date: 2019-03-26T16:42:12+01:00
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at>
Commit: https://github.com/plone/plone.app.contenttypes/commit/83d2b29b012cd15ab0d5f94ca40a4e8b932b7191
Date: 2019-03-26T23:40:40+01:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/plone.dexterity/commit/6fa7b3279ef8ae2d10404fddd1a85c95ffe58bce

Add content-core macro to summary_view.pt
Fixed DeprecationWarning for ObjectEvent.

Files changed:
A news/514.bugfix
M plone/app/contenttypes/browser/templates/listing_summary.pt
A news/96.bugfix
M plone/dexterity/events.py

b'diff --git a/news/514.bugfix b/news/514.bugfix\nnew file mode 100644\nindex 00000000..74e27a3d\n--- /dev/null\n+++ b/news/514.bugfix\n@@ -0,0 +1,2 @@\n+Add \'content-core\' macro definition to summary_view.pt so it can be reused\n+[petschki]\ndiff --git a/plone/app/contenttypes/browser/templates/listing_summary.pt b/plone/app/contenttypes/browser/templates/listing_summary.pt\nindex ddf660a4..0a923e35 100644\n--- a/plone/app/contenttypes/browser/templates/listing_summary.pt\n+++ b/plone/app/contenttypes/browser/templates/listing_summary.pt\n@@ -8,6 +8,8 @@\n <body>\n \n <metal:content-core fill-slot="content-core">\n+<metal:block define-macro="content-core">\n+\n <metal:block use-macro="context/@@listing_view/macros/content-core">\n \n <metal:entries fill-slot="entries">\n@@ -58,6 +60,8 @@\n </metal:block>\n </metal:entries>\n \n+</metal:block>\n+\n </metal:block>\n </metal:content-core>\n \n'
b'diff --git a/news/96.bugfix b/news/96.bugfix\nnew file mode 100644\nindex 0000000..9be8f51\n--- /dev/null\n+++ b/news/96.bugfix\n@@ -0,0 +1 @@\n+Fixed DeprecationWarning for ObjectEvent. [maurits]\ndiff --git a/plone/dexterity/events.py b/plone/dexterity/events.py\nindex 3d79fc9..4bee910 100644\n--- a/plone/dexterity/events.py\n+++ b/plone/dexterity/events.py\n@@ -1,6 +1,6 @@\n # -*- coding: utf-8 -*-\n from plone.dexterity import interfaces\n-from zope.component.interfaces import ObjectEvent\n+from zope.interface.interfaces import ObjectEvent\n from zope.interface import implementer\n \n \n'

Repository: plone.app.contenttypes
Repository: plone.dexterity


Branch: refs/heads/master
Date: 2019-04-01T15:27:24+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.contenttypes/commit/10d7e1691395b552043d0df02dacb1185eaf6880
Date: 2019-04-02T18:17:03+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/plone.dexterity/commit/b511d701e443a085c3c282af858b3075abb2cc24

Merge pull request #515 from plone/issue_514
Merge pull request #97 from plone/maurits-issue-96-deprecation

Add content-core macro to summary_view.pt
Fixed DeprecationWarning for ObjectEvent.

Files changed:
A news/514.bugfix
M plone/app/contenttypes/browser/templates/listing_summary.pt
A news/96.bugfix
M plone/dexterity/events.py

b'diff --git a/news/514.bugfix b/news/514.bugfix\nnew file mode 100644\nindex 00000000..74e27a3d\n--- /dev/null\n+++ b/news/514.bugfix\n@@ -0,0 +1,2 @@\n+Add \'content-core\' macro definition to summary_view.pt so it can be reused\n+[petschki]\ndiff --git a/plone/app/contenttypes/browser/templates/listing_summary.pt b/plone/app/contenttypes/browser/templates/listing_summary.pt\nindex ddf660a4..0a923e35 100644\n--- a/plone/app/contenttypes/browser/templates/listing_summary.pt\n+++ b/plone/app/contenttypes/browser/templates/listing_summary.pt\n@@ -8,6 +8,8 @@\n <body>\n \n <metal:content-core fill-slot="content-core">\n+<metal:block define-macro="content-core">\n+\n <metal:block use-macro="context/@@listing_view/macros/content-core">\n \n <metal:entries fill-slot="entries">\n@@ -58,6 +60,8 @@\n </metal:block>\n </metal:entries>\n \n+</metal:block>\n+\n </metal:block>\n </metal:content-core>\n \n'
b'diff --git a/news/96.bugfix b/news/96.bugfix\nnew file mode 100644\nindex 0000000..9be8f51\n--- /dev/null\n+++ b/news/96.bugfix\n@@ -0,0 +1 @@\n+Fixed DeprecationWarning for ObjectEvent. [maurits]\ndiff --git a/plone/dexterity/events.py b/plone/dexterity/events.py\nindex 3d79fc9..4bee910 100644\n--- a/plone/dexterity/events.py\n+++ b/plone/dexterity/events.py\n@@ -1,6 +1,6 @@\n # -*- coding: utf-8 -*-\n from plone.dexterity import interfaces\n-from zope.component.interfaces import ObjectEvent\n+from zope.interface.interfaces import ObjectEvent\n from zope.interface import implementer\n \n \n'

0 comments on commit 288b9ab

Please sign in to comment.