custom id if not setted

Pushword · Mar 16, 2022 · 4d046fb · 4d046fb
1 parent 5ea7f13
commit 4d046fb
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/packages/admin/src/FormField/HostField.php b/packages/admin/src/FormField/HostField.php
@@ -28,13 +28,17 @@ public function formField(FormMapper $form): FormMapper
 
         if ('' === $this->admin->getSubject()->getHost()) {
             $this->admin->getSubject()->setHost($this->getDefaultHost());
+
+            return $form;
         }
 
+        return $form;
+        /*
         return $form->add('host', ChoiceType::class, [
             'choices' => \Safe\array_combine($this->getHosts(), $this->getHosts()),
             'required' => false,
             'label' => 'admin.page.host.label',
-        ]);
+        ]);*/
     }
 
     private function getDefaultHost(): string

diff --git a/packages/admin/src/FormField/PageParentPageField.php b/packages/admin/src/FormField/PageParentPageField.php
@@ -29,9 +29,12 @@ public function formField(FormMapper $form): FormMapper
                     'label' => 'admin.page.parentPage.label',
                     'required' => false,
                 ],
-                (null !== $this->admin->getSubject()->getId() ? ['query_builder' => fn (PageRepository $er): QueryBuilder => $er->createQueryBuilder('p')
+                ['query_builder' => fn (PageRepository $er): QueryBuilder => $er->createQueryBuilder('p')
                     ->andWhere('p.id != :id')
-                    ->setParameter('id', $this->admin->getSubject()->getId()), ] : [])
+                    ->andWhere('p.host = :host')
+                    ->setParameter('id', (int) $this->admin->getSubject()->getId())
+                    ->setParameter('host', $this->admin->getSubject()->getHost()),
+                ]
             )
         );
     }

diff --git a/packages/admin/src/FormField/PageSlugField.php b/packages/admin/src/FormField/PageSlugField.php
@@ -20,7 +20,7 @@ protected function getSlugHelp(): string
         /** @param PageInterface $page */
         $page = $this->admin->getSubject();
 
-        $url = $this->admin->getRouter()->generate('pushword_page', ['slug' => $page->getRealSlug()]);
+        $url = $page->getHost().$this->admin->getRouter()->generate('pushword_page', ['slug' => $page->getRealSlug()]);
         $liveUrl = '' !== $page->getHost() ?
             $this->admin->getRouter()->generate(
                 'custom_host_pushword_page',

diff --git a/packages/core/src/EventListener/PageListener.php b/packages/core/src/EventListener/PageListener.php
@@ -26,6 +26,7 @@ public function preRemove(PageInterface $page): void
 
     public function prePersist(PageInterface $page): void
     {
+        $this->setIdAsSlugIfNotDefined($page);
         $this->updatePageEditor($page);
     }
 
@@ -69,4 +70,11 @@ private function updatePageEditor(PageInterface $page): void
         // $page->addPageHasEditor($pageHasEditor);
         // $this->entityManager->flush();
     }
+
+    public function setIdAsSlugIfNotDefined(PageInterface $page): void
+    {
+        if ('' === $page->getSlug()) {
+            $page->setSlug(substr(sha1(uniqid().rand()), 0, 8));
+        }
+    }
 }
diff --git a/packages/skeleton/var/app.db b/packages/skeleton/var/app.db