Controlpanel fixes

news/102.bugfix

@@ -0,0 +1,2 @@
+fix controlpanel view, dont render card element if no rules defined
+[1letter]

news/103.bugfix

@@ -0,0 +1,2 @@
+fix rendering of edit modal dialogs, exclude global tabs
+[1letter]

news/75.bugfix

@@ -0,0 +1,3 @@
+use WorkflowEditForm in WorkflowEditFormView
+use NotifyEditForm in NotifyEditFormView
+[1letter]

plone/app/contentrules/actions/notify.py

@@ -98,4 +98,4 @@ class NotifyEditForm(ActionEditForm):
 
 
 class NotifyEditFormView(ContentRuleFormWrapper):
-    form = NotifyAddForm
+    form = NotifyEditForm

plone/app/contentrules/actions/workflow.py

@@ -108,4 +108,4 @@ class WorkflowEditForm(ActionEditForm):
 
 
 class WorkflowEditFormView(ContentRuleFormWrapper):
-    form = WorkflowAddForm
+    form = WorkflowEditForm

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"

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};

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"

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"