wait #5428

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 4f87fa0d29eb6e145f0ae03003ac4d12ecc9aafa..facc7a53a4f5a6f7ef20ee3179b005c7a8c25f90 100644 (file)
--- 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 43c0d0ff624a25282d5a1e2e6e654a55075ea8f3..b79d7f299e55a84163b9ce9fa78662ca9151c1fb 100644 (file)
--- 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();
-    }
 }