Fix slug generator not taking into account sibling nodes

arbory · Jul 26, 2017 · 2ed7607 · 2ed7607
1 parent 786642b
commit 2ed7607
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/resources/assets/js/controllers/nodes.js b/resources/assets/js/controllers/nodes.js
@@ -105,12 +105,13 @@ class NodeStoreItem {
 }
 
 class SlugApiHandler {
-    constructor(apiUrl) {
+    constructor(apiUrl, parameters = {}) {
         this.apiUrl = apiUrl;
+        this.parameters = parameters;
     }
 
     create(string) {
-        return jQuery.get( this.apiUrl, { name: string } );
+        return jQuery.get(this.apiUrl, Object.assign({name: string}, this.parameters));
     }
 }
 
@@ -159,7 +160,9 @@ jQuery(document).ready(() => {
         let generateButton = slugField.find('.button.generate');
         let slugLink = slugField.find('.link');
 
-        let slugApi = new SlugApiHandler(slugInput.data('generatorUrl'));
+        let slugApi = new SlugApiHandler(slugInput.data('generatorUrl'), {
+            parent_id: slugInput.data('nodeParentId')
+        });
 
         let updateSlugLink = () => {
             slugLink.find('span:last').text(encodeURIComponent(slugInput.val()));

diff --git a/src/Admin/Form/Fields/Slug.php b/src/Admin/Form/Fields/Slug.php
@@ -42,7 +42,10 @@ public function render()
             ->setName( $this->getNameSpacedName() )
             ->setValue( $this->getValue() )
             ->addClass( 'text' )
-            ->addAttributes( [ 'data-generator-url' => $this->apiUrl ] );
+            ->addAttributes( [
+                'data-generator-url' => $this->apiUrl,
+                'data-node-parent-id' => $this->getParentId()
+            ] );
 
         $button = Button::create()
             ->type( 'button', 'secondary generate' )
@@ -132,7 +135,7 @@ protected function getUriToNewModel()
          * @var Node $parentNode
          */
         $repository = new NodesRepository;
-        $parentNode = $repository->find( request( 'parent_id' ) );
+        $parentNode = $repository->find( $this->getParentId() );
 
         return $parentNode ? $parentNode->getUri() : (string) null;
     }
@@ -144,4 +147,12 @@ protected function getUriToSlug()
     {
         return $this->getUriToExistingModel() ?: $this->getUriToNewModel();
     }
+
+    /**
+     * @return int
+     */
+    protected function getParentId()
+    {
+        return request( 'parent_id' ) ?: $this->getModel()->getParentId();
+    }
 }