IBX-7957: Suppressed validation on Save and Close (#65)

* IBX-7957: Suppressed validation on `Save and Close` * IBX-7957: Refactored code --------- Co-authored-by: Bartek Wajda <[email protected]>
ibexa · Mar 27, 2024 · 93b7a7c · 93b7a7c
1 parent 519420a
commit 93b7a7c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/lib/Form/EventSubscriber/SuppressValidationSubscriber.php b/src/lib/Form/EventSubscriber/SuppressValidationSubscriber.php
@@ -42,10 +42,11 @@ public function suppressValidationOnSaveDraft(PostSubmitEvent $event)
     {
         $form = $event->getForm();
 
-        if ($form->has('saveDraft')) {
-            if ($form->get('saveDraft')->isClicked()) {
-                $event->stopPropagation();
-            }
+        if (
+            ($form->has('saveDraft') && $form->get('saveDraft')->isClicked())
+            || ($form->has('saveDraftAndClose') && $form->get('saveDraftAndClose')->isClicked())
+        ) {
+            $event->stopPropagation();
         }
     }