diff --git a/last_commit.txt b/last_commit.txt index 5b8c8ecce4..7cb345b448 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,23 +1,32 @@ -Repository: plone.restapi +Repository: plone.app.theming -Branch: refs/heads/main -Date: 2024-09-03T19:18:12-07:00 -Author: Alessandro Ceglie (sauzher) -Commit: https://github.com/plone/plone.restapi/commit/aec08ce8f9d787694142a76b16f3147fef5d628c +Branch: refs/heads/master +Date: 2024-09-04T18:13:09+02:00 +Author: Johannes Raggam (thet) +Commit: https://github.com/plone/plone.app.theming/commit/61ef90d91ec1e9c2f7a3e806d006102784ba1aab -fix #1802 and #1803 (#1804) +Minor optimization to disable Diazo theming via "X-Theme-Disabled" a tick earlier. -* fix #1802 and #1803 - -* changelog - -* accepted stevepiercy suggestion on changelog +Files changed: +A news/244.internal +M src/plone/app/theming/policy.py + +b'diff --git a/news/244.internal b/news/244.internal\nnew file mode 100644\nindex 00000000..4fea9be5\n--- /dev/null\n+++ b/news/244.internal\n@@ -0,0 +1,2 @@\n+Minor optimization to disable Diazo theming via `X-Theme-Disabled` a tick earlier.\n+[thet]\ndiff --git a/src/plone/app/theming/policy.py b/src/plone/app/theming/policy.py\nindex d837ff22..227b7b4d 100644\n--- a/src/plone/app/theming/policy.py\n+++ b/src/plone/app/theming/policy.py\n@@ -67,14 +67,14 @@ def getCurrentTheme(self):\n def isThemeEnabled(self, settings=None):\n """Whether theming is enabled."""\n \n- # Resolve debug_mode late (i.e. not on import time) since it may\n- # be set during import or test setup time\n- debug_mode = getConfiguration().debug_mode\n-\n # Disable theming if the response sets a header\n if self.request.response.getHeader("X-Theme-Disabled"):\n return False\n \n+ # Resolve debug_mode late (i.e. not on import time) since it may\n+ # be set during import or test setup time\n+ debug_mode = getConfiguration().debug_mode\n+\n # Check for diazo.off request parameter\n true_vals = ("1", "y", "yes", "t", "true")\n if debug_mode and self.request.get("diazo.off", "").lower() in true_vals:\n' + +Repository: plone.app.theming + + +Branch: refs/heads/master +Date: 2024-09-04T21:31:06+02:00 +Author: Peter Mathis (petschki) +Commit: https://github.com/plone/plone.app.theming/commit/0f5a53f81114d24299763b28580aa07114d43eca + +Merge pull request #244 from plone/thet-minor-opt Files changed: -A news/1802.bugfix -M src/plone/restapi/pas/add_plugin.zpt -M src/plone/restapi/pas/config.zpt +A news/244.internal +M src/plone/app/theming/policy.py -b'diff --git a/news/1802.bugfix b/news/1802.bugfix\nnew file mode 100644\nindex 000000000..347ab28a2\n--- /dev/null\n+++ b/news/1802.bugfix\n@@ -0,0 +1 @@\n+Fixed implementation of the `jwt_auth` plugin. It now can be added, and its properties, `use_keyring` and `store_tokens`, can be updated. @sauzher\ndiff --git a/src/plone/restapi/pas/add_plugin.zpt b/src/plone/restapi/pas/add_plugin.zpt\nindex b7e8c3636..74ef44710 100644\n--- a/src/plone/restapi/pas/add_plugin.zpt\n+++ b/src/plone/restapi/pas/add_plugin.zpt\n@@ -14,7 +14,7 @@\n
\n \n
\n- \n+ \n
\n
\n \ndiff --git a/src/plone/restapi/pas/config.zpt b/src/plone/restapi/pas/config.zpt\nindex bfe372989..ecb3859a8 100644\n--- a/src/plone/restapi/pas/config.zpt\n+++ b/src/plone/restapi/pas/config.zpt\n@@ -10,19 +10,19 @@\n
\n
\n \n- \n After this, the token is invalid and the user must login again. Set to 0 for the token to remain valid indefinitely.\n
\n- \n+\n
\n
\n- \n \n If enabled, tokens are signed with a secret from Plone\'s keyring. If you want tokens that remain valid indefinitely you should disable this.\n@@ -31,10 +31,10 @@\n \n
\n
\n- \n \n By default tokens are not stored on the server and thus can\'t be invalidated. If enabled, tokens that don\'t expire can be invalidated.\n' +b'diff --git a/news/244.internal b/news/244.internal\nnew file mode 100644\nindex 00000000..4fea9be5\n--- /dev/null\n+++ b/news/244.internal\n@@ -0,0 +1,2 @@\n+Minor optimization to disable Diazo theming via `X-Theme-Disabled` a tick earlier.\n+[thet]\ndiff --git a/src/plone/app/theming/policy.py b/src/plone/app/theming/policy.py\nindex d837ff22..227b7b4d 100644\n--- a/src/plone/app/theming/policy.py\n+++ b/src/plone/app/theming/policy.py\n@@ -67,14 +67,14 @@ def getCurrentTheme(self):\n def isThemeEnabled(self, settings=None):\n """Whether theming is enabled."""\n \n- # Resolve debug_mode late (i.e. not on import time) since it may\n- # be set during import or test setup time\n- debug_mode = getConfiguration().debug_mode\n-\n # Disable theming if the response sets a header\n if self.request.response.getHeader("X-Theme-Disabled"):\n return False\n \n+ # Resolve debug_mode late (i.e. not on import time) since it may\n+ # be set during import or test setup time\n+ debug_mode = getConfiguration().debug_mode\n+\n # Check for diazo.off request parameter\n true_vals = ("1", "y", "yes", "t", "true")\n if debug_mode and self.request.get("diazo.off", "").lower() in true_vals:\n'