wip #6937 @1

diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index e130f38be278e73edb028d8359ff52016719b7b2..0dd185b262e902e412fde731dbbc52c07bc80503 100644 (file)
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -84,7 +84,7 @@ class CubistMagicController extends CubistCrudController
             }
         }
 
-        if ($model->isRevisionEnabled()) {
+        if (method_exists($this, "isRevisionEnabled") && $model->isRevisionEnabled()) {
             $this->revisionEnabled = true;
         }
 

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 69447506b6753a0addc2ffb9a98783a02aead79f..77b11f0549d37f6f4611027bc1ddb998ea0e6f51 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -48,7 +48,6 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 {
     use CrudTrait;
     use InteractsWithMedia;
-    use RevisionableTrait;
     use BunchOfFields {
         addField as protected bunchAddField;
     }
@@ -487,10 +486,10 @@ class CubistMagicAbstractModel extends Model implements HasMedia
                 $ops[] = BulkDeleteOperation::class;
             }
         }
-        if ($this->_enableRevisions) {
-            $ops[] = ReviseOperation::class;
-        }
-        $this->revisionEnabled = $this->_enableRevisions;
+//        if ($this->_enableRevisions) {
+//            $ops[] = ReviseOperation::class;
+//        }
+        //$this->revisionEnabled = $this->_enableRevisions;
         $ops = array_merge($ops, $this->_operations);
 
         foreach ($ops as $operation) {
@@ -503,10 +502,10 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         return $res;
     }
 
-    public function isRevisionEnabled()
-    {
-        return $this->_enableRevisions;
-    }
+//    public function isRevisionEnabled()
+//    {
+//        return $this->_enableRevisions;
+//    }
 
     protected function _replaceInCode($stub, $dest)
     {
@@ -1021,9 +1020,9 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 
     public function isButtonVisible($button)
     {
-        if ($button === 'revise') {
-            return $this->_enableRevisionsButton;
-        }
+//        if ($button === 'revise') {
+//            return $this->_enableRevisionsButton;
+//        }
         return true;
     }