Skip to content

Commit

Permalink
Merge pull request #36 from plone/config-with-default-template-0481af98
Browse files Browse the repository at this point in the history
Config with default template
  • Loading branch information
gforcada authored Mar 17, 2023
2 parents 0481af9 + 9d48e1d commit b76f296
Show file tree
Hide file tree
Showing 26 changed files with 572 additions and 277 deletions.
39 changes: 39 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
#
# EditorConfig Configuration file, for more details see:
# http://EditorConfig.org
# EditorConfig is a convention description, that could be interpreted
# by multiple editors to enforce common coding conventions for specific
# file types

# top-most EditorConfig file:
# Will ignore other EditorConfig files in Home directory or upper tree level.
root = true


[*] # For All Files
# Unix-style newlines with a newline ending every file
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
# Set default charset
charset = utf-8
# Indent style default
indent_style = space
# Max Line Length - a hard line wrap, should be disabled
max_line_length = off

[*.{py,cfg,ini}]
# 4 space indentation
indent_size = 4

[*.{yml,zpt,pt,dtml,zcml}]
# 2 space indentation
indent_size = 2

[{Makefile,.gitmodules}]
# Tab indentation (no size specified, but view as 4 spaces)
indent_style = tab
indent_size = unset
tab_width = unset
5 changes: 5 additions & 0 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
[meta]
template = "default"
commit-id = "789b0936"
42 changes: 42 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
ci:
autofix_prs: false
autoupdate_schedule: monthly

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
hooks:
- id: pyupgrade
args: [--py38-plus]
- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 23.1.0
hooks:
- id: black
- repo: https://github.com/collective/zpretty
rev: 3.0.2
hooks:
- id: zpretty
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
- id: flake8
- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
hooks:
- id: codespell
additional_dependencies:
- tomli
- repo: https://github.com/mgedmin/check-manifest
rev: "0.49"
hooks:
- id: check-manifest
- repo: https://github.com/regebro/pyroma
rev: "4.2"
hooks:
- id: pyroma
2 changes: 2 additions & 0 deletions news/789b0936.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
2 changes: 1 addition & 1 deletion plone/app/workflow/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Register the permissions with Zope
from zope.i18nmessageid import MessageFactory

import plone.app.workflow.permissions
import plone.app.workflow.permissions # noqa: F401


PloneMessageFactory = MessageFactory("plone")
29 changes: 15 additions & 14 deletions plone/app/workflow/browser/configure.zcml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser">
xmlns:browser="http://namespaces.zope.org/browser"
>

<browser:page
name="sharing"
for="*"
class=".sharing.SharingView"
permission="plone.DelegateRoles"
/>
<browser:page
name="sharing"
for="*"
class=".sharing.SharingView"
permission="plone.DelegateRoles"
/>

<browser:page
name="updateSharingInfo"
for="*"
class=".sharing.SharingView"
attribute="updateSharingInfo"
permission="plone.DelegateRoles"
/>
<browser:page
name="updateSharingInfo"
for="*"
class=".sharing.SharingView"
attribute="updateSharingInfo"
permission="plone.DelegateRoles"
/>

</configure>
17 changes: 10 additions & 7 deletions plone/app/workflow/browser/macro_wrapper.pt
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
i18n:domain="plone">
<tal:defines define="here nocall:options/instance;
view nocall:options/view;">
<metal:block use-macro="options/the_macro" />
</tal:defines>
<tal:block xmlns:metal="http://xml.zope.org/namespaces/metal"
xmlns:tal="http://xml.zope.org/namespaces/tal"
i18n:domain="plone"
>
<tal:defines define="
here nocall:options/instance;
view nocall:options/view;
">
<metal:block use-macro="options/the_macro" />
</tal:defines>
</tal:block>
Loading

0 comments on commit b76f296

Please sign in to comment.