From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 29 May 2019 12:49:32 +0000 (+0200)
Subject: #2783
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6a4151162e510dcee56efa5ed4892b2b9726ea43;p=cubist_cms-back.git

#2783
---

diff --git a/composer.json b/composer.json
index 6ce0ea2..1337331 100644
--- a/composer.json
+++ b/composer.json
@@ -30,16 +30,13 @@
         "barryvdh/laravel-elfinder": "^0.4.1",
         "cubist/util": "dev-master",
         "fideloper/proxy": "^4.0",
-        "laravel/tinker": "^1.0",
         "predis/predis": "^1.1",
-        "webfactor/laravel-backpack-instant-fields": "^2.1.2",
-        "laracasts/generators": "1.1.4",
+        "webfactor/laravel-backpack-instant-fields": "^2.3.1",
         "webfactor/laravel-backpack-nestedmodels": "^1.0.1@dev"
     },
     "require-dev": {
-        "backpack/generators": "^1.2",
         "filp/whoops": "^2.3",
-        "laracasts/generators": "^1.1"
+        "laravel/tinker": "^1.0"
     },
     "extra": {
         "branch-alias": {
diff --git a/src/app/Magic/Models/CubistMagicModelAbstract.php b/src/app/Magic/Models/CubistMagicModelAbstract.php
index 8840436..04ab127 100644
--- a/src/app/Magic/Models/CubistMagicModelAbstract.php
+++ b/src/app/Magic/Models/CubistMagicModelAbstract.php
@@ -12,18 +12,14 @@ use Doctrine\DBAL\Schema\Schema;
 use Illuminate\Database\Eloquent\Model;
 use Cubist\Backpack\app\Magic\CubistMagicAttribute;
 use Illuminate\Support\Str;
-use Webfactor\Laravel\Backpack\NestedModels\Traits\NestedModelTrait;
 
 class CubistMagicModelAbstract extends Model
 {
     use CubistMagicAttribute;
     use SluggableScopeHelpers;
     use CrudTrait;
-    use NestedModelTrait {
-        replicate as private replicateNodeTrait;
-    }
     use Sluggable {
-        replicate as private replicateSluggable;
+        replicate as protected replicateSluggable;
     }
 
     protected static $_doctrineTypesMapping = ['int' => 'integer'];
@@ -201,7 +197,6 @@ class CubistMagicModelAbstract extends Model
 
     public function replicate(array $except = null)
     {
-        $this->replicateNodeTrait($except);
         $this->replicateSluggable($except);
     }
 
diff --git a/src/app/Magic/Models/CubistMagicNestedModel.php b/src/app/Magic/Models/CubistMagicNestedModel.php
new file mode 100644
index 0000000..306e479
--- /dev/null
+++ b/src/app/Magic/Models/CubistMagicNestedModel.php
@@ -0,0 +1,21 @@
+<?php
+
+
+namespace app\Magic\Models;
+
+
+use Cubist\Backpack\app\Magic\Models\CubistMagicModelAbstract;
+use Webfactor\Laravel\Backpack\NestedModels\Traits\NestedModelTrait;
+
+class CubistMagicNestedModel extends CubistMagicModelAbstract
+{
+    use NestedModelTrait {
+        replicate as private replicateNodeTrait;
+    }
+
+    public function replicate(array $except = null)
+    {
+        $this->replicateNodeTrait($except);
+        $this->replicateSluggable($except);
+    }
+}