From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 2 Sep 2022 14:24:51 +0000 (+0200)
Subject: wait #5428
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=df14f798d44ba8b72f8b5765d2e15ebc24e6591f;p=cubist_cms-back.git

wait #5428
---

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 4f87fa0..facc7a5 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -428,7 +428,8 @@ class CubistMagicAbstractModel extends Model implements HasMedia
     protected function _getUse()
     {
         $res = '';
-        $ops = $this->_operations;
+        $ops = [];
+
         if ($this->_enableCreation) {
             $ops[] = CreateOperation::class;
             $ops[] = CloneEditOperation::class;
@@ -454,6 +455,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         if ($this->_enableRevisions) {
             $ops[] = ReviseOperation::class;
         }
+        $ops = array_merge($ops, $this->_operations);
 
         foreach ($ops as $operation) {
             if ($operation[0] !== '\\') {
diff --git a/src/app/Magic/Operations/UpdateOperation.php b/src/app/Magic/Operations/UpdateOperation.php
index 43c0d0f..b79d7f2 100644
--- a/src/app/Magic/Operations/UpdateOperation.php
+++ b/src/app/Magic/Operations/UpdateOperation.php
@@ -1,13 +1,13 @@
 <?php
 
 namespace Cubist\Backpack\Magic\Operations;
+
 use Cubist\Backpack\Magic\Models\CubistMagicAbstractModel;
 
 trait UpdateOperation
 {
     use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation {
         update as _update;
-        setupUpdateDefaults as _setupUpdateDefaults;
     }
 
     /**
@@ -24,8 +24,4 @@ trait UpdateOperation
         return $res;
     }
 
-    protected function setupUpdateDefaults()
-    {
-        $this->_setupUpdateDefaults();
-    }
 }