Skip to content

Commit

Permalink
[fc] Repository: plone.app.contentmenu
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2024-08-17T08:14:37+05:30
Author: Rohan Shaw (rohnsha0) <rohnsha0@gmail.com>
Commit: plone/plone.app.contentmenu@b8c0880

Fixes plone-pat-modal redirection issue after changing state from content menu

Files changed:
A news/3989.bugfix
M plone/app/contentmenu/menu.py
Repository: plone.app.contentmenu

Branch: refs/heads/master
Date: 2024-08-17T02:48:22Z
Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Commit: plone/plone.app.contentmenu@068b692

[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Files changed:
M plone/app/contentmenu/menu.py
Repository: plone.app.contentmenu

Branch: refs/heads/master
Date: 2024-08-19T12:24:52+05:30
Author: Rohan Shaw (rohnsha0) <86848116+rohnsha0@users.noreply.github.com>
Commit: plone/plone.app.contentmenu@4d14889

Update news/3989.bugfix

Co-authored-by: Peter Mathis &lt;petschki@users.noreply.github.com&gt;

Files changed:
M news/3989.bugfix
Repository: plone.app.contentmenu

Branch: refs/heads/master
Date: 2024-08-19T13:28:11+05:30
Author: Rohan Shaw (rohnsha0) <86848116+rohnsha0@users.noreply.github.com>
Commit: plone/plone.app.contentmenu@c0f49ec

Merge pull request #70 from plone/rohnsha0-plone-pat-modal-redirection

Fixes plone-pat-modal redirection issue after changing state from content menu

Files changed:
A news/3989.bugfix
M plone/app/contentmenu/menu.py
  • Loading branch information
rohnsha0 committed Aug 19, 2024
1 parent 3a90629 commit 420f82e
Showing 1 changed file with 42 additions and 39 deletions.
81 changes: 42 additions & 39 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,65 +1,68 @@
Repository: plone.formwidget.recurrence
Repository: plone.app.contentmenu


Branch: refs/heads/master
Date: 2024-08-05T20:34:31Z
Date: 2024-08-17T08:14:37+05:30
Author: Rohan Shaw (rohnsha0) <rohnsha0@gmail.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/b8c0880273a0e4564d74a7432492795b0039bba1

Fixes plone-pat-modal redirection issue after changing state from content menu

Files changed:
A news/3989.bugfix
M plone/app/contentmenu/menu.py

b'diff --git a/news/3989.bugfix b/news/3989.bugfix\nnew file mode 100644\nindex 0000000..f484a17\n--- /dev/null\n+++ b/news/3989.bugfix\n@@ -0,0 +1 @@\n+Fixes plone-pat-modal redirection issue after changing state from content menu [rohnsha0]\n\\ No newline at end of file\ndiff --git a/plone/app/contentmenu/menu.py b/plone/app/contentmenu/menu.py\nindex e8c1e5f..d916597 100644\n--- a/plone/app/contentmenu/menu.py\n+++ b/plone/app/contentmenu/menu.py\n@@ -896,6 +896,7 @@ def getMenuItems(self, context, request):\n "modal": json.dumps(\n {\n "modalSizeClass": "modal-xl",\n+ "actionOptions": {"redirectOnResponse": True}\n }\n ),\n },\n'

Repository: plone.app.contentmenu


Branch: refs/heads/master
Date: 2024-08-17T02:48:22Z
Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Commit: https://github.com/plone/plone.formwidget.recurrence/commit/d5c7ed23352c9861d90c00c2a9338a38e6d4e05a
Commit: https://github.com/plone/plone.app.contentmenu/commit/068b692db779233df96b490ac2c4bf9bdbea7744

[pre-commit.ci] pre-commit autoupdate
[pre-commit.ci] auto fixes from pre-commit.com hooks

updates:
- [github.com/asottile/pyupgrade: v3.15.2 → v3.17.0](https://github.com/asottile/pyupgrade/compare/v3.15.2...v3.17.0)
- [github.com/psf/black: 24.4.2 → 24.8.0](https://github.com/psf/black/compare/24.4.2...24.8.0)
- [github.com/PyCQA/flake8: 7.0.0 → 7.1.1](https://github.com/PyCQA/flake8/compare/7.0.0...7.1.1)
- [github.com/codespell-project/codespell: v2.2.6 → v2.3.0](https://github.com/codespell-project/codespell/compare/v2.2.6...v2.3.0)
- [github.com/collective/i18ndude: 6.2.0 → 6.2.1](https://github.com/collective/i18ndude/compare/6.2.0...6.2.1)
for more information, see https://pre-commit.ci

Files changed:
M .pre-commit-config.yaml
M plone/app/contentmenu/menu.py

b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex d60054b..1460326 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -7,7 +7,7 @@ ci:\n \n repos:\n - repo: https://github.com/asottile/pyupgrade\n- rev: v3.15.2\n+ rev: v3.17.0\n hooks:\n - id: pyupgrade\n args: [--py38-plus]\n@@ -16,7 +16,7 @@ repos:\n hooks:\n - id: isort\n - repo: https://github.com/psf/black\n- rev: 24.4.2\n+ rev: 24.8.0\n hooks:\n - id: black\n - repo: https://github.com/collective/zpretty\n@@ -32,7 +32,7 @@ repos:\n # """\n ##\n - repo: https://github.com/PyCQA/flake8\n- rev: 7.0.0\n+ rev: 7.1.1\n hooks:\n - id: flake8\n \n@@ -44,7 +44,7 @@ repos:\n # """\n ##\n - repo: https://github.com/codespell-project/codespell\n- rev: v2.2.6\n+ rev: v2.3.0\n hooks:\n - id: codespell\n additional_dependencies:\n@@ -71,7 +71,7 @@ repos:\n - id: check-python-versions\n args: [\'--only\', \'setup.py,pyproject.toml\']\n - repo: https://github.com/collective/i18ndude\n- rev: "6.2.0"\n+ rev: "6.2.1"\n hooks:\n - id: i18ndude\n \n'
b'diff --git a/plone/app/contentmenu/menu.py b/plone/app/contentmenu/menu.py\nindex d916597..ce626e4 100644\n--- a/plone/app/contentmenu/menu.py\n+++ b/plone/app/contentmenu/menu.py\n@@ -896,7 +896,7 @@ def getMenuItems(self, context, request):\n "modal": json.dumps(\n {\n "modalSizeClass": "modal-xl",\n- "actionOptions": {"redirectOnResponse": True}\n+ "actionOptions": {"redirectOnResponse": True},\n }\n ),\n },\n'

Repository: plone.formwidget.recurrence
Repository: plone.app.contentmenu


Branch: refs/heads/master
Date: 2024-08-19T08:53:07+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: https://github.com/plone/plone.formwidget.recurrence/commit/48448a26695d66615603adc71a3ce7cea14ad526
Date: 2024-08-19T12:24:52+05:30
Author: Rohan Shaw (rohnsha0) <86848116+rohnsha0@users.noreply.github.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/4d1488934a408c98d6157d2324a573e394be2e0b

Configuring with plone/meta
Update news/3989.bugfix

Co-authored-by: Peter Mathis &lt;petschki@users.noreply.github.com&gt;

Files changed:
A dependabot.yml
M .editorconfig
M .github/workflows/meta.yml
M .meta.toml
M pyproject.toml
M tox.ini
M news/3989.bugfix

b'diff --git a/.editorconfig b/.editorconfig\nindex fa698fb..5b3c112 100644\n--- a/.editorconfig\n+++ b/.editorconfig\n@@ -13,7 +13,8 @@\n root = true\n \n \n-[*] # For All Files\n+[*]\n+# Default settings for all files.\n # Unix-style newlines with a newline ending every file\n end_of_line = lf\n insert_final_newline = true\n@@ -33,7 +34,8 @@ indent_size = 4\n # 2 space indentation\n indent_size = 2\n \n-[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}] # Frontend development\n+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]\n+# Frontend development\n # 2 space indentation\n indent_size = 2\n max_line_length = 80\ndiff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml\nindex b8edec0..c9848bc 100644\n--- a/.github/workflows/meta.yml\n+++ b/.github/workflows/meta.yml\n@@ -57,6 +57,13 @@ jobs:\n # os_dependencies = "git libxml2 libxslt"\n ##\n \n+##\n+# To test against a specific matrix of python versions\n+# when running tests jobs, add in .meta.toml:\n+# [github]\n+# py_versions = "[\'3.12\', \'3.11\']"\n+##\n+\n \n ##\n # Specify additional jobs in .meta.toml:\ndiff --git a/.meta.toml b/.meta.toml\nindex 938bd08..948cbec 100644\n--- a/.meta.toml\n+++ b/.meta.toml\n@@ -3,7 +3,7 @@\n # See the inline comments on how to expand/tweak this configuration file\n [meta]\n template = "default"\n-commit-id = "6e36bcc4"\n+commit-id = "7a017355"\n \n [pyproject]\n check_manifest_ignores = """\ndiff --git a/dependabot.yml b/dependabot.yml\nnew file mode 100644\nindex 0000000..bbd3ab0\n--- /dev/null\n+++ b/dependabot.yml\n@@ -0,0 +1,11 @@\n+# Generated from:\n+# https://github.com/plone/meta/tree/main/config/default\n+# See the inline comments on how to expand/tweak this configuration file\n+version: 2\n+updates:\n+\n+ - package-ecosystem: "github-actions"\n+ directory: "/"\n+ schedule:\n+ # Check for updates to GitHub Actions every week\n+ interval: "weekly"\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 9fed3b2..548ffe2 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -71,7 +71,7 @@ target-version = ["py38"]\n ##\n \n [tool.codespell]\n-ignore-words-list = "discreet,"\n+ignore-words-list = "discreet,assertin,"\n skip = "*.po,"\n ##\n # Add extra configuration options in .meta.toml:\n@@ -134,11 +134,12 @@ ignore-packages = [\'z3c.form\']\n [tool.check-manifest]\n ignore = [\n ".editorconfig",\n+ ".flake8",\n ".meta.toml",\n ".pre-commit-config.yaml",\n- "tox.ini",\n- ".flake8",\n+ "dependabot.yml",\n "mx.ini",\n+ "tox.ini",\n "Makefile",\n "constraints.txt",\n "instance.yaml",\n@@ -146,6 +147,7 @@ ignore = [\n "sources.ini",\n \n ]\n+\n ##\n # Add extra configuration options in .meta.toml:\n # [pyproject]\n@@ -153,6 +155,11 @@ ignore = [\n # "*.map.js",\n # "*.pyc",\n # """\n+# check_manifest_extra_lines = """\n+# ignore-bad-ideas = [\n+# "some/test/file/PKG-INFO",\n+# ]\n+# """\n ##\n \n [tool.coverage.report]\ndiff --git a/tox.ini b/tox.ini\nindex 6dc88d1..8dd280e 100644\n--- a/tox.ini\n+++ b/tox.ini\n@@ -109,7 +109,7 @@ set_env =\n deps =\n zope.testrunner\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n- \n+\n ##\n # Specify additional deps in .meta.toml:\n # [tox]\n@@ -152,11 +152,12 @@ deps =\n coverage\n zope.testrunner\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n- \n+\n commands =\n coverage run --branch --source plone.formwidget.recurrence {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.formwidget.recurrence {posargs}\n coverage report -m --format markdown\n coverage xml\n+ coverage html\n extras =\n test\n \n@@ -169,7 +170,7 @@ deps =\n build\n towncrier\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n- \n+\n commands =\n # fake version to not have to install the package\n # we build the change log as news entries might break\n@@ -182,6 +183,9 @@ commands =\n description = ensure there are no cyclic dependencies\n use_develop = true\n skip_install = false\n+# Here we must always constrain the package deps to what is already installed,\n+# otherwise we simply get the latest from PyPI, which may not work.\n+constrain_package_deps = true\n set_env =\n \n ##\n@@ -197,7 +201,7 @@ deps =\n pipdeptree\n pipforester\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n- \n+\n commands =\n # Generate the full dependency tree\n sh -c \'pipdeptree -j > forest.json\'\n'
b'diff --git a/news/3989.bugfix b/news/3989.bugfix\nindex f484a17..7763b0e 100644\n--- a/news/3989.bugfix\n+++ b/news/3989.bugfix\n@@ -1 +1 @@\n-Fixes plone-pat-modal redirection issue after changing state from content menu [rohnsha0]\n\\ No newline at end of file\n+Fixes pat-plone-modal redirection issue after changing state from content menu [rohnsha0]\n\\ No newline at end of file\n'

Repository: plone.formwidget.recurrence
Repository: plone.app.contentmenu


Branch: refs/heads/master
Date: 2024-08-19T08:59:49+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: https://github.com/plone/plone.formwidget.recurrence/commit/b1e515b916401c56206bb94bfa6383a6a3db8aeb
Date: 2024-08-19T13:28:11+05:30
Author: Rohan Shaw (rohnsha0) <86848116+rohnsha0@users.noreply.github.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/c0f49ec046a18ef210da7ad8f2273057a10d11ee

Merge pull request #52 from plone/pre-commit-ci-update-config
Merge pull request #70 from plone/rohnsha0-plone-pat-modal-redirection

[pre-commit.ci] pre-commit autoupdate
Fixes plone-pat-modal redirection issue after changing state from content menu

Files changed:
A dependabot.yml
M .editorconfig
M .github/workflows/meta.yml
M .meta.toml
M .pre-commit-config.yaml
M pyproject.toml
M tox.ini

b'diff --git a/.editorconfig b/.editorconfig\nindex fa698fb..5b3c112 100644\n--- a/.editorconfig\n+++ b/.editorconfig\n@@ -13,7 +13,8 @@\n root = true\n \n \n-[*] # For All Files\n+[*]\n+# Default settings for all files.\n # Unix-style newlines with a newline ending every file\n end_of_line = lf\n insert_final_newline = true\n@@ -33,7 +34,8 @@ indent_size = 4\n # 2 space indentation\n indent_size = 2\n \n-[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}] # Frontend development\n+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]\n+# Frontend development\n # 2 space indentation\n indent_size = 2\n max_line_length = 80\ndiff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml\nindex b8edec0..c9848bc 100644\n--- a/.github/workflows/meta.yml\n+++ b/.github/workflows/meta.yml\n@@ -57,6 +57,13 @@ jobs:\n # os_dependencies = "git libxml2 libxslt"\n ##\n \n+##\n+# To test against a specific matrix of python versions\n+# when running tests jobs, add in .meta.toml:\n+# [github]\n+# py_versions = "[\'3.12\', \'3.11\']"\n+##\n+\n \n ##\n # Specify additional jobs in .meta.toml:\ndiff --git a/.meta.toml b/.meta.toml\nindex 938bd08..948cbec 100644\n--- a/.meta.toml\n+++ b/.meta.toml\n@@ -3,7 +3,7 @@\n # See the inline comments on how to expand/tweak this configuration file\n [meta]\n template = "default"\n-commit-id = "6e36bcc4"\n+commit-id = "7a017355"\n \n [pyproject]\n check_manifest_ignores = """\ndiff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex d60054b..1460326 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -7,7 +7,7 @@ ci:\n \n repos:\n - repo: https://github.com/asottile/pyupgrade\n- rev: v3.15.2\n+ rev: v3.17.0\n hooks:\n - id: pyupgrade\n args: [--py38-plus]\n@@ -16,7 +16,7 @@ repos:\n hooks:\n - id: isort\n - repo: https://github.com/psf/black\n- rev: 24.4.2\n+ rev: 24.8.0\n hooks:\n - id: black\n - repo: https://github.com/collective/zpretty\n@@ -32,7 +32,7 @@ repos:\n # """\n ##\n - repo: https://github.com/PyCQA/flake8\n- rev: 7.0.0\n+ rev: 7.1.1\n hooks:\n - id: flake8\n \n@@ -44,7 +44,7 @@ repos:\n # """\n ##\n - repo: https://github.com/codespell-project/codespell\n- rev: v2.2.6\n+ rev: v2.3.0\n hooks:\n - id: codespell\n additional_dependencies:\n@@ -71,7 +71,7 @@ repos:\n - id: check-python-versions\n args: [\'--only\', \'setup.py,pyproject.toml\']\n - repo: https://github.com/collective/i18ndude\n- rev: "6.2.0"\n+ rev: "6.2.1"\n hooks:\n - id: i18ndude\n \ndiff --git a/dependabot.yml b/dependabot.yml\nnew file mode 100644\nindex 0000000..bbd3ab0\n--- /dev/null\n+++ b/dependabot.yml\n@@ -0,0 +1,11 @@\n+# Generated from:\n+# https://github.com/plone/meta/tree/main/config/default\n+# See the inline comments on how to expand/tweak this configuration file\n+version: 2\n+updates:\n+\n+ - package-ecosystem: "github-actions"\n+ directory: "/"\n+ schedule:\n+ # Check for updates to GitHub Actions every week\n+ interval: "weekly"\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 9fed3b2..548ffe2 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -71,7 +71,7 @@ target-version = ["py38"]\n ##\n \n [tool.codespell]\n-ignore-words-list = "discreet,"\n+ignore-words-list = "discreet,assertin,"\n skip = "*.po,"\n ##\n # Add extra configuration options in .meta.toml:\n@@ -134,11 +134,12 @@ ignore-packages = [\'z3c.form\']\n [tool.check-manifest]\n ignore = [\n ".editorconfig",\n+ ".flake8",\n ".meta.toml",\n ".pre-commit-config.yaml",\n- "tox.ini",\n- ".flake8",\n+ "dependabot.yml",\n "mx.ini",\n+ "tox.ini",\n "Makefile",\n "constraints.txt",\n "instance.yaml",\n@@ -146,6 +147,7 @@ ignore = [\n "sources.ini",\n \n ]\n+\n ##\n # Add extra configuration options in .meta.toml:\n # [pyproject]\n@@ -153,6 +155,11 @@ ignore = [\n # "*.map.js",\n # "*.pyc",\n # """\n+# check_manifest_extra_lines = """\n+# ignore-bad-ideas = [\n+# "some/test/file/PKG-INFO",\n+# ]\n+# """\n ##\n \n [tool.coverage.report]\ndiff --git a/tox.ini b/tox.ini\nindex 6dc88d1..8dd280e 100644\n--- a/tox.ini\n+++ b/tox.ini\n@@ -109,7 +109,7 @@ set_env =\n deps =\n zope.testrunner\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n- \n+\n ##\n # Specify additional deps in .meta.toml:\n # [tox]\n@@ -152,11 +152,12 @@ deps =\n coverage\n zope.testrunner\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n- \n+\n commands =\n coverage run --branch --source plone.formwidget.recurrence {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.formwidget.recurrence {posargs}\n coverage report -m --format markdown\n coverage xml\n+ coverage html\n extras =\n test\n \n@@ -169,7 +170,7 @@ deps =\n build\n towncrier\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n- \n+\n commands =\n # fake version to not have to install the package\n # we build the change log as news entries might break\n@@ -182,6 +183,9 @@ commands =\n description = ensure there are no cyclic dependencies\n use_develop = true\n skip_install = false\n+# Here we must always constrain the package deps to what is already installed,\n+# otherwise we simply get the latest from PyPI, which may not work.\n+constrain_package_deps = true\n set_env =\n \n ##\n@@ -197,7 +201,7 @@ deps =\n pipdeptree\n pipforester\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n- \n+\n commands =\n # Generate the full dependency tree\n sh -c \'pipdeptree -j > forest.json\'\n'
A news/3989.bugfix
M plone/app/contentmenu/menu.py

b'diff --git a/news/3989.bugfix b/news/3989.bugfix\nnew file mode 100644\nindex 0000000..7763b0e\n--- /dev/null\n+++ b/news/3989.bugfix\n@@ -0,0 +1 @@\n+Fixes pat-plone-modal redirection issue after changing state from content menu [rohnsha0]\n\\ No newline at end of file\ndiff --git a/plone/app/contentmenu/menu.py b/plone/app/contentmenu/menu.py\nindex e8c1e5f..ce626e4 100644\n--- a/plone/app/contentmenu/menu.py\n+++ b/plone/app/contentmenu/menu.py\n@@ -896,6 +896,7 @@ def getMenuItems(self, context, request):\n "modal": json.dumps(\n {\n "modalSizeClass": "modal-xl",\n+ "actionOptions": {"redirectOnResponse": True},\n }\n ),\n },\n'

0 comments on commit 420f82e

Please sign in to comment.