Delete and locale fixes

dravencms · Sep 13, 2019 · 9e77307 · 9e77307
1 parent 3003902
commit 9e77307
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 0 deletions.
diff --git a/src/Dravencms/AdminModule/Components/Form/FormGrid/FormGrid.php b/src/Dravencms/AdminModule/Components/Form/FormGrid/FormGrid.php
@@ -139,6 +139,18 @@ public function handleDelete($id)
         $forms = $this->formRepository->getById($id);
         foreach ($forms AS $form)
         {
+            foreach ($form->getItemGroups() AS $itemGroup)
+            {
+                foreach ($itemGroup->getItems() AS $item)
+                {
+                    foreach ($item->getItemOptions() AS $itemOption)
+                    {
+                        $this->entityManager->remove($itemOption);
+                    }
+                    $this->entityManager->remove($item);
+                }
+                $this->entityManager->remove($itemGroup);
+            }
             $this->entityManager->remove($form);
         }
 

diff --git a/src/Dravencms/AdminModule/Components/Form/ItemGrid/ItemGrid.php b/src/Dravencms/AdminModule/Components/Form/ItemGrid/ItemGrid.php
@@ -174,6 +174,10 @@ public function handleDelete($id)
         $items = $this->itemRepository->getById($id);
         foreach ($items AS $item)
         {
+            foreach ($item->getItemOptions() AS $itemOption)
+            {
+                $this->entityManager->remove($itemOption);
+            }
             $this->entityManager->remove($item);
         }
 

diff --git a/src/Dravencms/AdminModule/Components/Form/ItemGroupGrid/ItemGroupGrid.php b/src/Dravencms/AdminModule/Components/Form/ItemGroupGrid/ItemGroupGrid.php
@@ -156,6 +156,14 @@ public function handleDelete($id)
         $itemGroups = $this->itemGroupRepository->getById($id);
         foreach ($itemGroups AS $itemGroup)
         {
+            foreach ($itemGroup->getItems() AS $item)
+            {
+                foreach ($item->getItemOptions() AS $itemOption)
+                {
+                    $this->entityManager->remove($itemOption);
+                }
+                $this->entityManager->remove($item);
+            }
             $this->entityManager->remove($itemGroup);
         }
 

diff --git a/src/Dravencms/FrontModule/Components/Form/Form/Detail/Detail.php b/src/Dravencms/FrontModule/Components/Form/Form/Detail/Detail.php
@@ -120,6 +120,7 @@ public function render()
         $template = $this->template;
 
         $template->formInfo = $this->formInfo;
+        $template->currentLocale = $this->currentLocale;
 
         if ($this->formInfoTranslation->getLatteTemplate())
         {

diff --git a/src/Dravencms/FrontModule/Components/Form/Form/Detail/detail.latte b/src/Dravencms/FrontModule/Components/Form/Form/Detail/detail.latte
@@ -3,6 +3,10 @@
         <li n:foreach="$form->errors as $error">{$error}</li>
     </ul>
     {foreach $formInfo->getItemGroups() AS $formsItemsGroups}
+        {if $formsItemsGroups->isShowName()}
+        <fieldset>
+            <legend>{$formsItemsGroups->translate($currentLocale)->getName()}</legend>
+        {/if}
         {foreach $formsItemsGroups->getItems() AS $formsItems}
             <div class="form-group control-group">
                 {if $formsItems->getType() == 'select'}
@@ -14,6 +18,9 @@
                 {/if}
             </div>
         {/foreach}
+            {if $formsItemsGroups->isShowName()}
+            </fieldset>
+            {/if}
     {/foreach}
 
     <div n:if="$formInfo->isAntispam()" class="form-group control-group">

diff --git a/src/Dravencms/Model/Form/Entities/ItemGroup.php b/src/Dravencms/Model/Form/Entities/ItemGroup.php
@@ -2,7 +2,9 @@
 namespace Dravencms\Model\Form\Entities;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
+use Dravencms\Model\Locale\Entities\ILocale;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Gedmo\Timestampable\Traits\TimestampableEntity;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
@@ -154,5 +156,15 @@ public function getTranslations()
     {
         return $this->translations;
     }
+
+    /**
+     * @param ILocale $locale
+     * @return GalleryTranslation
+     */
+    public function translate(ILocale $locale)
+    {
+        $criteria = Criteria::create()->where(Criteria::expr()->eq("locale", $locale));
+        return $this->getTranslations()->matching($criteria)->first();
+    }
 }