From 6e377875f3bb0d1f775415c2bca1a31f461d5814 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 16 Jun 2020 20:18:35 +0200
Subject: [PATCH] wip #3712

---
 src/app/Magic/Fields/Field.php                    | 4 +++-
 src/app/Magic/Models/CubistMagicAbstractModel.php | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php
index 1fd15db..30776a1 100644
--- a/src/app/Magic/Fields/Field.php
+++ b/src/app/Magic/Fields/Field.php
@@ -168,9 +168,11 @@ class Field implements \ArrayAccess
             'type' => $this->getAttribute('column_type'),
             'label' => $this->getAttribute('column_label', $this->getAttribute('label')),
             'searchLogic' => $this->getAttribute('searchLogic'),
-            'format' => $this->getAttribute('column_format', null)
+            'format' => $this->getAttribute('column_format', null),
+            'orderable' => true,
         ];
 
+
         return $res;
     }
 
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 5ead94d..f48f317 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -35,6 +35,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 
     protected static $_doctrineTypesMapping = ['int' => 'integer'];
 
+    protected $connection = null;
     protected $primaryKey = 'id';
     public $timestamps = true;
     public $clonable = true;
@@ -75,13 +76,15 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 
     public function __construct(array $attributes = [])
     {
-
         $this->setup();
         $this->fill($attributes);
     }
 
     public function setup()
     {
+        if (null !== $this->connection) {
+            $this->setConnection($this->connection);
+        }
         $this->setFields();
         $this->postSetFields();
         $this->bootIfNotBooted();
-- 
2.39.5