From 5fc513b77259ae8d99137c024506cce450b9a5db Mon Sep 17 00:00:00 2001 From: petschki Date: Fri, 8 Nov 2024 11:41:51 +0100 Subject: [PATCH] [fc] Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-07T09:23:28+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/1c3dc9f7d1cb7567d1edf051b4917477f299d7a2 use WorkflowEditForm in WorkflowEditFormView Files changed: M plone/app/contentrules/actions/workflow.py Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-07T09:24:01+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/b6f2dcb6c45fbd6ba487f4e5a42e73ed063ca7d8 use NotifyEditForm in NotifyEditFormView Files changed: M plone/app/contentrules/actions/notify.py Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-07T09:28:29+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/ebb52709b08b49816e806f4cab26523c5089b680 add news Files changed: A news/75.bugfix Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-07T09:33:52+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/e62c8fa0c09b23fba412fcc4a864448f9e8bddbf lint news format file Files changed: M news/75.bugfix Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-07T09:34:51+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/f92350d11e0b5f36c94f8cd1c933f5c157ed6950 add blank line to newsfile Files changed: M news/75.bugfix Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-07T10:31:54+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/5932d49539506447ac80cc15f2f035a218cf2444 fix controlpanel view, dont render card element if no rules defined Files changed: M plone/app/contentrules/browser/templates/controlpanel.pt Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-07T10:32:27+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/16e667cafbb1b4a36bc1b1eafd339ce99f4b9626 add news Files changed: A news/102.bugfix Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-07T10:42:05+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/426b1c4318a5b1a2dae8d34b449cc8137580a743 fix rendering of edit modal dialogs Files changed: M plone/app/contentrules/browser/templates/manage-elements.pt Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-07T10:42:51+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/4b22a5ee6349412c2ee5f107f89de5eadd8edb43 add news Files changed: A news/103.bugfix Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-08T10:22:36+01:00 Author: 1letter (1letter) <1letter@gmx.de> Commit: https://github.com/plone/plone.app.contentrules/commit/9b048b67254b7e8a21fff3568c255ab3e1fb6691 add tests to check is the editform for actions invoked Files changed: M plone/app/contentrules/tests/test_action_notify.py M plone/app/contentrules/tests/test_action_workflow.py Repository: plone.app.contentrules Branch: refs/heads/master Date: 2024-11-08T11:41:51+01:00 Author: Peter Mathis (petschki) Commit: https://github.com/plone/plone.app.contentrules/commit/e14ba696230eb4a3ca562467cdd6efa3201ae109 Merge pull request #101 from plone/fix#75 Controlpanel fixes Files changed: A news/102.bugfix A news/103.bugfix A news/75.bugfix M plone/app/contentrules/actions/notify.py M plone/app/contentrules/actions/workflow.py M plone/app/contentrules/browser/templates/controlpanel.pt M plone/app/contentrules/browser/templates/manage-elements.pt M plone/app/contentrules/tests/test_action_notify.py M plone/app/contentrules/tests/test_action_workflow.py --- last_commit.txt | 174 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 151 insertions(+), 23 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 2675930122..de85c9a00f 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,48 +1,176 @@ -Repository: Products.CMFPlone +Repository: plone.app.contentrules Branch: refs/heads/master -Date: 2024-11-07T14:49:09+01:00 -Author: Peter Mathis (petschki) -Commit: https://github.com/plone/Products.CMFPlone/commit/db27409f5423652f00f0325928e137fab43cadcd +Date: 2024-11-07T09:23:28+01:00 +Author: 1letter (1letter) <1letter@gmx.de> +Commit: https://github.com/plone/plone.app.contentrules/commit/1c3dc9f7d1cb7567d1edf051b4917477f299d7a2 -More modal click fixes +use WorkflowEditForm in WorkflowEditFormView Files changed: -M Products/CMFPlone/tests/robot/test_controlpanel_actions.robot +M plone/app/contentrules/actions/workflow.py -b'diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot b/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot\nindex 1574010f60..231bc246b6 100644\n--- a/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot\n+++ b/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot\n@@ -65,27 +65,27 @@ the actions control panel\n \n I modify an action title\n Click //*[@id="content-core"]/section[2]/section/ol/li[1]/form/a\n- Get Text //body contains Action Settings\n+ Wait For Condition Text //body contains Action Settings\n Type Text //input[@name="form.widgets.title"] A new site map\n Click //div[contains(@class,\'pattern-modal-buttons\')]/button\n \n \n I change the actions order\n Click //*[@id="content-core"]/section[2]/section/ol/li[1]/form/a\n- Get Text //body contains Action Settings\n+ Wait For Condition Text //body contains Action Settings\n Type Text //input[@name="form.widgets.position"] 3\n Click //div[contains(@class,\'pattern-modal-buttons\')]/button\n \n \n I add a new action\n Click //*[@id="content-core"]/p[@class="addAction"]/a\n- Get Text //body contains New action\n+ Wait For Condition Text //body contains New action\n Select Options By //select[@name="form.widgets.category:list"] label User actions\n Type Text //input[@name="form.widgets.id"] favorites\n Click //div[contains(@class,\'pattern-modal-buttons\')]/button\n- Get Text //body contains favorites\n+ Wait For Condition Text //body contains favorites\n Click //*[@id="content-core"]/section[6]/section/ol/li[8]/form/a\n- Get Text //body contains Action Settings\n+ Wait For Condition Text //body contains Action Settings\n Type Text //input[@name="form.widgets.title"] My favorites\n Type Text //input[@name="form.widgets.url_expr"] string:\\${globals_view/navigationRootUrl}/favorites\n Click //div[contains(@class,\'pattern-modal-buttons\')]/button\n@@ -136,4 +136,4 @@ anonymous users cannot see the action anymore\n anonymous users can see the action again\n Disable autologin\n Go to ${PLONE_URL}\n- Get Text //body contains Site Map\n\\ No newline at end of file\n+ Get Text //body contains Site Map\n' +b'diff --git a/plone/app/contentrules/actions/workflow.py b/plone/app/contentrules/actions/workflow.py\nindex 211e42a..23c95df 100644\n--- a/plone/app/contentrules/actions/workflow.py\n+++ b/plone/app/contentrules/actions/workflow.py\n@@ -108,4 +108,4 @@ class WorkflowEditForm(ActionEditForm):\n \n \n class WorkflowEditFormView(ContentRuleFormWrapper):\n- form = WorkflowAddForm\n+ form = WorkflowEditForm\n' -Repository: Products.CMFPlone +Repository: plone.app.contentrules Branch: refs/heads/master -Date: 2024-11-07T14:50:03+01:00 -Author: Peter Mathis (petschki) -Commit: https://github.com/plone/Products.CMFPlone/commit/e4f7b419782b79addc8db880473f9414d2a5904e +Date: 2024-11-07T09:24:01+01:00 +Author: 1letter (1letter) <1letter@gmx.de> +Commit: https://github.com/plone/plone.app.contentrules/commit/b6f2dcb6c45fbd6ba487f4e5a42e73ed063ca7d8 -changenote +use NotifyEditForm in NotifyEditFormView Files changed: -M news/4045.bugfixes +M plone/app/contentrules/actions/notify.py -b'diff --git a/news/4045.bugfixes b/news/4045.bugfixes\nindex 0744c9a37b..336fba81af 100644\n--- a/news/4045.bugfixes\n+++ b/news/4045.bugfixes\n@@ -1,2 +1,2 @@\n-Fix more unstable robottests with "Wait For Condition".\n+Fix more unstable robottests with "Wait For Condition" when clicking modal links.\n [petschki]\n' +b'diff --git a/plone/app/contentrules/actions/notify.py b/plone/app/contentrules/actions/notify.py\nindex a03cd64..5101041 100644\n--- a/plone/app/contentrules/actions/notify.py\n+++ b/plone/app/contentrules/actions/notify.py\n@@ -98,4 +98,4 @@ class NotifyEditForm(ActionEditForm):\n \n \n class NotifyEditFormView(ContentRuleFormWrapper):\n- form = NotifyAddForm\n+ form = NotifyEditForm\n' -Repository: Products.CMFPlone +Repository: plone.app.contentrules Branch: refs/heads/master -Date: 2024-11-07T15:24:47+01:00 -Author: Peter Mathis (petschki) -Commit: https://github.com/plone/Products.CMFPlone/commit/887db0053943f4f8092d3e559acda83999402277 +Date: 2024-11-07T09:28:29+01:00 +Author: 1letter (1letter) <1letter@gmx.de> +Commit: https://github.com/plone/plone.app.contentrules/commit/ebb52709b08b49816e806f4cab26523c5089b680 + +add news + +Files changed: +A news/75.bugfix + +b'diff --git a/news/75.bugfix b/news/75.bugfix\nnew file mode 100644\nindex 0000000..0052fa3\n--- /dev/null\n+++ b/news/75.bugfix\n@@ -0,0 +1,3 @@\n+- use WorkflowEditForm in WorkflowEditFormView\n+- use NotifyEditForm in NotifyEditFormView\n+[1letter]\n' -Merge pull request #4047 from plone/petschki-robottest-modal-fix +Repository: plone.app.contentrules -Robottest modal click fixes in actioncontrolpanel + +Branch: refs/heads/master +Date: 2024-11-07T09:33:52+01:00 +Author: 1letter (1letter) <1letter@gmx.de> +Commit: https://github.com/plone/plone.app.contentrules/commit/e62c8fa0c09b23fba412fcc4a864448f9e8bddbf + +lint news format file Files changed: -M Products/CMFPlone/tests/robot/test_controlpanel_actions.robot -M news/4045.bugfixes +M news/75.bugfix + +b'diff --git a/news/75.bugfix b/news/75.bugfix\nindex 0052fa3..37f7e2d 100644\n--- a/news/75.bugfix\n+++ b/news/75.bugfix\n@@ -1,3 +1,3 @@\n-- use WorkflowEditForm in WorkflowEditFormView\n-- use NotifyEditForm in NotifyEditFormView\n-[1letter]\n+use WorkflowEditForm in WorkflowEditFormView\n+use NotifyEditForm in NotifyEditFormView\n+[1letter]\n\\ No newline at end of file\n' + +Repository: plone.app.contentrules + + +Branch: refs/heads/master +Date: 2024-11-07T09:34:51+01:00 +Author: 1letter (1letter) <1letter@gmx.de> +Commit: https://github.com/plone/plone.app.contentrules/commit/f92350d11e0b5f36c94f8cd1c933f5c157ed6950 + +add blank line to newsfile + +Files changed: +M news/75.bugfix + +b'diff --git a/news/75.bugfix b/news/75.bugfix\nindex 37f7e2d..4cf0af1 100644\n--- a/news/75.bugfix\n+++ b/news/75.bugfix\n@@ -1,3 +1,3 @@\n use WorkflowEditForm in WorkflowEditFormView\n use NotifyEditForm in NotifyEditFormView\n-[1letter]\n\\ No newline at end of file\n+[1letter]\n' + +Repository: plone.app.contentrules + + +Branch: refs/heads/master +Date: 2024-11-07T10:31:54+01:00 +Author: 1letter (1letter) <1letter@gmx.de> +Commit: https://github.com/plone/plone.app.contentrules/commit/5932d49539506447ac80cc15f2f035a218cf2444 + +fix controlpanel view, dont render card element if no rules defined + +Files changed: +M plone/app/contentrules/browser/templates/controlpanel.pt + +b'diff --git a/plone/app/contentrules/browser/templates/controlpanel.pt b/plone/app/contentrules/browser/templates/controlpanel.pt\nindex 021f1f6..e6c648b 100644\n--- a/plone/app/contentrules/browser/templates/controlpanel.pt\n+++ b/plone/app/contentrules/browser/templates/controlpanel.pt\n@@ -114,12 +114,14 @@\n \n \n \n-
\n+
\n
\n \n
+Commit: https://github.com/plone/plone.app.contentrules/commit/16e667cafbb1b4a36bc1b1eafd339ce99f4b9626 + +add news + +Files changed: +A news/102.bugfix + +b'diff --git a/news/102.bugfix b/news/102.bugfix\nnew file mode 100644\nindex 0000000..2a6fff0\n--- /dev/null\n+++ b/news/102.bugfix\n@@ -0,0 +1,2 @@\n+fix controlpanel view, dont render card element if no rules defined\n+[1letter]\n' -b'diff --git a/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot b/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot\nindex 1574010f60..231bc246b6 100644\n--- a/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot\n+++ b/Products/CMFPlone/tests/robot/test_controlpanel_actions.robot\n@@ -65,27 +65,27 @@ the actions control panel\n \n I modify an action title\n Click //*[@id="content-core"]/section[2]/section/ol/li[1]/form/a\n- Get Text //body contains Action Settings\n+ Wait For Condition Text //body contains Action Settings\n Type Text //input[@name="form.widgets.title"] A new site map\n Click //div[contains(@class,\'pattern-modal-buttons\')]/button\n \n \n I change the actions order\n Click //*[@id="content-core"]/section[2]/section/ol/li[1]/form/a\n- Get Text //body contains Action Settings\n+ Wait For Condition Text //body contains Action Settings\n Type Text //input[@name="form.widgets.position"] 3\n Click //div[contains(@class,\'pattern-modal-buttons\')]/button\n \n \n I add a new action\n Click //*[@id="content-core"]/p[@class="addAction"]/a\n- Get Text //body contains New action\n+ Wait For Condition Text //body contains New action\n Select Options By //select[@name="form.widgets.category:list"] label User actions\n Type Text //input[@name="form.widgets.id"] favorites\n Click //div[contains(@class,\'pattern-modal-buttons\')]/button\n- Get Text //body contains favorites\n+ Wait For Condition Text //body contains favorites\n Click //*[@id="content-core"]/section[6]/section/ol/li[8]/form/a\n- Get Text //body contains Action Settings\n+ Wait For Condition Text //body contains Action Settings\n Type Text //input[@name="form.widgets.title"] My favorites\n Type Text //input[@name="form.widgets.url_expr"] string:\\${globals_view/navigationRootUrl}/favorites\n Click //div[contains(@class,\'pattern-modal-buttons\')]/button\n@@ -136,4 +136,4 @@ anonymous users cannot see the action anymore\n anonymous users can see the action again\n Disable autologin\n Go to ${PLONE_URL}\n- Get Text //body contains Site Map\n\\ No newline at end of file\n+ Get Text //body contains Site Map\ndiff --git a/news/4045.bugfixes b/news/4045.bugfixes\nindex 0744c9a37b..336fba81af 100644\n--- a/news/4045.bugfixes\n+++ b/news/4045.bugfixes\n@@ -1,2 +1,2 @@\n-Fix more unstable robottests with "Wait For Condition".\n+Fix more unstable robottests with "Wait For Condition" when clicking modal links.\n [petschki]\n' +Repository: plone.app.contentrules + + +Branch: refs/heads/master +Date: 2024-11-07T10:42:05+01:00 +Author: 1letter (1letter) <1letter@gmx.de> +Commit: https://github.com/plone/plone.app.contentrules/commit/426b1c4318a5b1a2dae8d34b449cc8137580a743 + +fix rendering of edit modal dialogs + +Files changed: +M plone/app/contentrules/browser/templates/manage-elements.pt + +b'diff --git a/plone/app/contentrules/browser/templates/manage-elements.pt b/plone/app/contentrules/browser/templates/manage-elements.pt\nindex 8aed297..9b1dd38 100644\n--- a/plone/app/contentrules/browser/templates/manage-elements.pt\n+++ b/plone/app/contentrules/browser/templates/manage-elements.pt\n@@ -94,7 +94,7 @@\n
\n
\n \n
\n +Commit: https://github.com/plone/plone.app.contentrules/commit/e14ba696230eb4a3ca562467cdd6efa3201ae109 + +Merge pull request #101 from plone/fix#75 + +Controlpanel fixes + +Files changed: +A news/102.bugfix +A news/103.bugfix +A news/75.bugfix +M plone/app/contentrules/actions/notify.py +M plone/app/contentrules/actions/workflow.py +M plone/app/contentrules/browser/templates/controlpanel.pt +M plone/app/contentrules/browser/templates/manage-elements.pt +M plone/app/contentrules/tests/test_action_notify.py +M plone/app/contentrules/tests/test_action_workflow.py + +b'diff --git a/news/102.bugfix b/news/102.bugfix\nnew file mode 100644\nindex 0000000..2a6fff0\n--- /dev/null\n+++ b/news/102.bugfix\n@@ -0,0 +1,2 @@\n+fix controlpanel view, dont render card element if no rules defined\n+[1letter]\ndiff --git a/news/103.bugfix b/news/103.bugfix\nnew file mode 100644\nindex 0000000..6997906\n--- /dev/null\n+++ b/news/103.bugfix\n@@ -0,0 +1,2 @@\n+fix rendering of edit modal dialogs, exclude global tabs\n+[1letter]\ndiff --git a/news/75.bugfix b/news/75.bugfix\nnew file mode 100644\nindex 0000000..4cf0af1\n--- /dev/null\n+++ b/news/75.bugfix\n@@ -0,0 +1,3 @@\n+use WorkflowEditForm in WorkflowEditFormView\n+use NotifyEditForm in NotifyEditFormView\n+[1letter]\ndiff --git a/plone/app/contentrules/actions/notify.py b/plone/app/contentrules/actions/notify.py\nindex a03cd64..5101041 100644\n--- a/plone/app/contentrules/actions/notify.py\n+++ b/plone/app/contentrules/actions/notify.py\n@@ -98,4 +98,4 @@ class NotifyEditForm(ActionEditForm):\n \n \n class NotifyEditFormView(ContentRuleFormWrapper):\n- form = NotifyAddForm\n+ form = NotifyEditForm\ndiff --git a/plone/app/contentrules/actions/workflow.py b/plone/app/contentrules/actions/workflow.py\nindex 211e42a..23c95df 100644\n--- a/plone/app/contentrules/actions/workflow.py\n+++ b/plone/app/contentrules/actions/workflow.py\n@@ -108,4 +108,4 @@ class WorkflowEditForm(ActionEditForm):\n \n \n class WorkflowEditFormView(ContentRuleFormWrapper):\n- form = WorkflowAddForm\n+ form = WorkflowEditForm\ndiff --git a/plone/app/contentrules/browser/templates/controlpanel.pt b/plone/app/contentrules/browser/templates/controlpanel.pt\nindex 021f1f6..e6c648b 100644\n--- a/plone/app/contentrules/browser/templates/controlpanel.pt\n+++ b/plone/app/contentrules/browser/templates/controlpanel.pt\n@@ -114,12 +114,14 @@\n
\n \n \n-
\n+
\n
\n \n
\n
\n \n
\n