From 1c3dc9f7d1cb7567d1edf051b4917477f299d7a2 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 7 Nov 2024 09:23:28 +0100
Subject: [PATCH 01/10] use WorkflowEditForm in WorkflowEditFormView

---
 plone/app/contentrules/actions/workflow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plone/app/contentrules/actions/workflow.py b/plone/app/contentrules/actions/workflow.py
index 211e42a..23c95df 100644
--- a/plone/app/contentrules/actions/workflow.py
+++ b/plone/app/contentrules/actions/workflow.py
@@ -108,4 +108,4 @@ class WorkflowEditForm(ActionEditForm):
 
 
 class WorkflowEditFormView(ContentRuleFormWrapper):
-    form = WorkflowAddForm
+    form = WorkflowEditForm

From b6f2dcb6c45fbd6ba487f4e5a42e73ed063ca7d8 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 7 Nov 2024 09:24:01 +0100
Subject: [PATCH 02/10] use NotifyEditForm in NotifyEditFormView

---
 plone/app/contentrules/actions/notify.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plone/app/contentrules/actions/notify.py b/plone/app/contentrules/actions/notify.py
index a03cd64..5101041 100644
--- a/plone/app/contentrules/actions/notify.py
+++ b/plone/app/contentrules/actions/notify.py
@@ -98,4 +98,4 @@ class NotifyEditForm(ActionEditForm):
 
 
 class NotifyEditFormView(ContentRuleFormWrapper):
-    form = NotifyAddForm
+    form = NotifyEditForm

From ebb52709b08b49816e806f4cab26523c5089b680 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 7 Nov 2024 09:28:29 +0100
Subject: [PATCH 03/10] add news

---
 news/75.bugfix | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 news/75.bugfix

diff --git a/news/75.bugfix b/news/75.bugfix
new file mode 100644
index 0000000..0052fa3
--- /dev/null
+++ b/news/75.bugfix
@@ -0,0 +1,3 @@
+- use WorkflowEditForm in WorkflowEditFormView
+- use NotifyEditForm in NotifyEditFormView
+[1letter]

From e62c8fa0c09b23fba412fcc4a864448f9e8bddbf Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 7 Nov 2024 09:33:52 +0100
Subject: [PATCH 04/10] lint news format file

---
 news/75.bugfix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/news/75.bugfix b/news/75.bugfix
index 0052fa3..37f7e2d 100644
--- a/news/75.bugfix
+++ b/news/75.bugfix
@@ -1,3 +1,3 @@
-- use WorkflowEditForm in WorkflowEditFormView
-- use NotifyEditForm in NotifyEditFormView
-[1letter]
+use WorkflowEditForm in WorkflowEditFormView
+use NotifyEditForm in NotifyEditFormView
+[1letter]
\ No newline at end of file

From f92350d11e0b5f36c94f8cd1c933f5c157ed6950 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 7 Nov 2024 09:34:51 +0100
Subject: [PATCH 05/10] add blank line to newsfile

---
 news/75.bugfix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/news/75.bugfix b/news/75.bugfix
index 37f7e2d..4cf0af1 100644
--- a/news/75.bugfix
+++ b/news/75.bugfix
@@ -1,3 +1,3 @@
 use WorkflowEditForm in WorkflowEditFormView
 use NotifyEditForm in NotifyEditFormView
-[1letter]
\ No newline at end of file
+[1letter]

From 5932d49539506447ac80cc15f2f035a218cf2444 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 7 Nov 2024 10:31:54 +0100
Subject: [PATCH 06/10] fix controlpanel view, dont render card element if no
 rules defined

---
 .../app/contentrules/browser/templates/controlpanel.pt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plone/app/contentrules/browser/templates/controlpanel.pt b/plone/app/contentrules/browser/templates/controlpanel.pt
index 021f1f6..e6c648b 100644
--- a/plone/app/contentrules/browser/templates/controlpanel.pt
+++ b/plone/app/contentrules/browser/templates/controlpanel.pt
@@ -114,12 +114,14 @@
         </div>
 
 
-        <div class="card">
+        <div class="card"
+             tal:define="
+               rules rules|view/registeredRules;
+             "
+             tal:condition="rules"
+        >
           <fieldset class="card-body"
                     id="fieldset-rules"
-                    tal:define="
-                      rules rules|view/registeredRules;
-                    "
           >
 
             <div class="filters row row-cols-lg-auto g-3 align-items-center"

From 16e667cafbb1b4a36bc1b1eafd339ce99f4b9626 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 7 Nov 2024 10:32:27 +0100
Subject: [PATCH 07/10] add news

---
 news/102.bugfix | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 news/102.bugfix

diff --git a/news/102.bugfix b/news/102.bugfix
new file mode 100644
index 0000000..2a6fff0
--- /dev/null
+++ b/news/102.bugfix
@@ -0,0 +1,2 @@
+fix controlpanel view, dont render card element if no rules defined
+[1letter]

From 426b1c4318a5b1a2dae8d34b449cc8137580a743 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 7 Nov 2024 10:42:05 +0100
Subject: [PATCH 08/10] fix rendering of edit modal dialogs

---
 plone/app/contentrules/browser/templates/manage-elements.pt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plone/app/contentrules/browser/templates/manage-elements.pt b/plone/app/contentrules/browser/templates/manage-elements.pt
index 8aed297..9b1dd38 100644
--- a/plone/app/contentrules/browser/templates/manage-elements.pt
+++ b/plone/app/contentrules/browser/templates/manage-elements.pt
@@ -94,7 +94,7 @@
                   <div class="col-auto">
                     <div class="rule-operations">
                       <a class="pat-plone-modal btn btn-sm btn-primary"
-                         data-pat-plone-modal="modalSizeClass: modal-xl;"
+                         data-pat-plone-modal="modalSizeClass: modal-xl;content:#content-core"
                          tal:condition="condition/editview"
                          tal:attributes="
                            href string:${condition/editview}?_authenticator=${auth_token};
@@ -234,7 +234,7 @@
                   <div class="col-auto">
                     <div class="rule-operations">
                       <a class="pat-plone-modal btn btn-sm btn-primary"
-                         data-pat-plone-modal="modalSizeClass: modal-xl;"
+                         data-pat-plone-modal="modalSizeClass: modal-xl;content:#content-core"
                          tal:condition="action/editview"
                          tal:attributes="
                            href string:${action/editview}?_authenticator=${auth_token};

From 4b22a5ee6349412c2ee5f107f89de5eadd8edb43 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Thu, 7 Nov 2024 10:42:51 +0100
Subject: [PATCH 09/10] add news

---
 news/103.bugfix | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 news/103.bugfix

diff --git a/news/103.bugfix b/news/103.bugfix
new file mode 100644
index 0000000..6997906
--- /dev/null
+++ b/news/103.bugfix
@@ -0,0 +1,2 @@
+fix rendering of edit modal dialogs, exclude global tabs
+[1letter]

From 9b048b67254b7e8a21fff3568c255ab3e1fb6691 Mon Sep 17 00:00:00 2001
From: 1letter <1letter@gmx.de>
Date: Fri, 8 Nov 2024 10:22:36 +0100
Subject: [PATCH 10/10] add tests to check is the editform for actions invoked

---
 plone/app/contentrules/tests/test_action_notify.py   | 7 +++++++
 plone/app/contentrules/tests/test_action_workflow.py | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/plone/app/contentrules/tests/test_action_notify.py b/plone/app/contentrules/tests/test_action_notify.py
index 32e1456..23a279c 100644
--- a/plone/app/contentrules/tests/test_action_notify.py
+++ b/plone/app/contentrules/tests/test_action_notify.py
@@ -1,4 +1,5 @@
 from plone.app.contentrules.actions.notify import NotifyAction
+from plone.app.contentrules.actions.notify import NotifyEditForm
 from plone.app.contentrules.actions.notify import NotifyEditFormView
 from plone.app.contentrules.rule import Rule
 from plone.app.contentrules.tests.base import ContentRulesTestCase
@@ -52,6 +53,12 @@ def testInvokeEditView(self):
         editview = getMultiAdapter((e, self.request), name=element.editview)
         self.assertTrue(isinstance(editview, NotifyEditFormView))
 
+    def testInvokeEditForm(self):
+        element = getUtility(IRuleAction, name="plone.actions.Notify")
+        e = NotifyAction()
+        editview = getMultiAdapter((e, self.request), name=element.editview)
+        self.assertTrue(isinstance(editview.form_instance, NotifyEditForm))
+
     def testExecute(self):
         e = NotifyAction()
         e.message = "Hello world"
diff --git a/plone/app/contentrules/tests/test_action_workflow.py b/plone/app/contentrules/tests/test_action_workflow.py
index dfa10b8..18a2775 100644
--- a/plone/app/contentrules/tests/test_action_workflow.py
+++ b/plone/app/contentrules/tests/test_action_workflow.py
@@ -1,4 +1,5 @@
 from plone.app.contentrules.actions.workflow import WorkflowAction
+from plone.app.contentrules.actions.workflow import WorkflowEditForm
 from plone.app.contentrules.actions.workflow import WorkflowEditFormView
 from plone.app.contentrules.rule import Rule
 from plone.app.contentrules.tests.base import ContentRulesTestCase
@@ -52,6 +53,12 @@ def testInvokeEditView(self):
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
         self.assertTrue(isinstance(editview, WorkflowEditFormView))
 
+    def testInvokeEditForm(self):
+        element = getUtility(IRuleAction, name="plone.actions.Workflow")
+        e = WorkflowAction()
+        editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
+        self.assertTrue(isinstance(editview.form_instance, WorkflowEditForm))
+
     def testExecute(self):
         e = WorkflowAction()
         e.transition = "publish"