diff --git a/docs/Changelog.rst b/docs/Changelog.rst index b8acba41..d475656d 100644 --- a/docs/Changelog.rst +++ b/docs/Changelog.rst @@ -1,6 +1,7 @@ 2.4.0 (unreleased) ------------------ +- #136 Change default browserlayer - #134 Convert impress header table to senaite.app.listing - #133 Refactor publish view controls and content table to viewlets - #132 Add custom action provider for direct PDF sharing via email diff --git a/src/senaite/impress/actions/configure.zcml b/src/senaite/impress/actions/configure.zcml index c6e76189..6baf4788 100644 --- a/src/senaite/impress/actions/configure.zcml +++ b/src/senaite/impress/actions/configure.zcml @@ -9,7 +9,7 @@ for="*" class=".providers.DownloadPDF" permission="zope2.View" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> @@ -18,7 +18,7 @@ for="*" class=".providers.SendPDF" permission="zope2.View" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> diff --git a/src/senaite/impress/browser/publish/configure.zcml b/src/senaite/impress/browser/publish/configure.zcml index 5f51280d..db456428 100644 --- a/src/senaite/impress/browser/publish/configure.zcml +++ b/src/senaite/impress/browser/publish/configure.zcml @@ -8,7 +8,7 @@ name="publish_content_listing" class=".content.ContentListingView" permission="zope2.View" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> diff --git a/src/senaite/impress/browser/viewlets/configure.zcml b/src/senaite/impress/browser/viewlets/configure.zcml index b9b76a57..2d5de510 100644 --- a/src/senaite/impress/browser/viewlets/configure.zcml +++ b/src/senaite/impress/browser/viewlets/configure.zcml @@ -16,7 +16,7 @@ manager=".interfaces.IPublishCustomHtmlHeadViewlets" class="senaite.app.listing.browser.viewlets.resources.ResourcesViewlet" permission="zope2.View" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> diff --git a/src/senaite/impress/configure.zcml b/src/senaite/impress/configure.zcml index a6e55f2f..b3b48822 100644 --- a/src/senaite/impress/configure.zcml +++ b/src/senaite/impress/configure.zcml @@ -29,7 +29,7 @@ name="printview" class="senaite.impress.publishview.PublishView" permission="senaite.core.permissions.ManageAnalysisRequests" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> @@ -38,7 +38,7 @@ name="publish" class="senaite.impress.publishview.PublishView" permission="senaite.core.permissions.ManageAnalysisRequests" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> @@ -47,7 +47,7 @@ name="publish" class="senaite.impress.publishview.PublishView" permission="senaite.core.permissions.ManageAnalysisRequests" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> @@ -56,7 +56,7 @@ name="publish" class="senaite.impress.publishview.PublishView" permission="senaite.core.permissions.ManageAnalysisRequests" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> @@ -65,7 +65,7 @@ name="publish" class="senaite.impress.publishview.PublishView" permission="senaite.core.permissions.ManageAnalysisRequests" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> @@ -74,7 +74,7 @@ name="ajax_publish" class="senaite.impress.ajax.AjaxPublishView" permission="zope.Public" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> @@ -83,7 +83,7 @@ for="Products.CMFPlone.interfaces.IPloneSiteRoot" class=".controlpanel.ImpressControlPanelView" permission="senaite.core.permissions.ManageBika" - layer="senaite.impress.interfaces.ILayer" + layer="senaite.impress.interfaces.ISenaiteImpressLayer" /> diff --git a/src/senaite/impress/profiles/default/browserlayer.xml b/src/senaite/impress/profiles/default/browserlayer.xml index 2222f7ca..0bb22b30 100644 --- a/src/senaite/impress/profiles/default/browserlayer.xml +++ b/src/senaite/impress/profiles/default/browserlayer.xml @@ -1,5 +1,9 @@ + + + diff --git a/src/senaite/impress/profiles/default/metadata.xml b/src/senaite/impress/profiles/default/metadata.xml index 38b73116..49ef5c39 100644 --- a/src/senaite/impress/profiles/default/metadata.xml +++ b/src/senaite/impress/profiles/default/metadata.xml @@ -1,3 +1,3 @@ - 2402 + 2403 diff --git a/src/senaite/impress/profiles/uninstall/browserlayer.xml b/src/senaite/impress/profiles/uninstall/browserlayer.xml index e971e634..80b992b5 100644 --- a/src/senaite/impress/profiles/uninstall/browserlayer.xml +++ b/src/senaite/impress/profiles/uninstall/browserlayer.xml @@ -1,7 +1,6 @@ - - + diff --git a/src/senaite/impress/profiles/uninstall/metadata.xml b/src/senaite/impress/profiles/uninstall/metadata.xml deleted file mode 100644 index 505da7bd..00000000 --- a/src/senaite/impress/profiles/uninstall/metadata.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 2400 - diff --git a/src/senaite/impress/profiles/uninstall/senaite.impress.uninstall.txt b/src/senaite/impress/profiles/uninstall/senaite.impress.uninstall.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/src/senaite/impress/upgrades/v02_04_000.py b/src/senaite/impress/upgrades/v02_04_000.py index 260d0743..8029caf4 100644 --- a/src/senaite/impress/upgrades/v02_04_000.py +++ b/src/senaite/impress/upgrades/v02_04_000.py @@ -24,3 +24,13 @@ def import_registry(tool): logger.info("Import SENAITE IMPRESS registry ...") tool.runImportStepFromProfile(PROFILE_ID, "plone.app.registry") logger.info("Import SENAITE IMPRESS registry [DONE]") + + +def import_browserlayer(tool): + """Import browser layer + + :param tool: portal_setup tool + """ + logger.info("Import SENAITE IMPRESS browser layer ...") + tool.runImportStepFromProfile(PROFILE_ID, "browserlayer") + logger.info("Import SENAITE IMPRESS browser layer [DONE]") diff --git a/src/senaite/impress/upgrades/v02_04_000.zcml b/src/senaite/impress/upgrades/v02_04_000.zcml index 271a281c..19efe6e9 100644 --- a/src/senaite/impress/upgrades/v02_04_000.zcml +++ b/src/senaite/impress/upgrades/v02_04_000.zcml @@ -20,4 +20,12 @@ handler="senaite.impress.upgrades.v02_04_000.import_registry" profile="senaite.impress:default"/> + +