wip #3753 @1

diff --git a/src/app/Http/Controllers/Operations/ListOperation.php b/src/app/Http/Controllers/Operations/ListOperation.php
index 8529e8d3131805f0051652abcf440e24b4f07be3..d146fedeb34584ed2657797d06f71045ab5fac39 100644 (file)
--- a/src/app/Http/Controllers/Operations/ListOperation.php
+++ b/src/app/Http/Controllers/Operations/ListOperation.php
@@ -6,5 +6,13 @@ namespace Cubist\Backpack\Http\Controllers\Operations;
 
 trait ListOperation
 {
-    use \Backpack\CRUD\app\Http\Controllers\Operations\ListOperation;
+    use \Backpack\CRUD\app\Http\Controllers\Operations\ListOperation {
+        index as baseIndex;
+    }
+
+    protected function index()
+    {
+        $this->getModelInstance()->addWidgets();
+        return $this->baseIndex();
+    }
 }

diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index 9b8b98858b49cd0be5eb796cd8be30b85a43f93d..971159ab7345fafca2f5ef89a57d115c5618b20b 100644 (file)
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -86,7 +86,7 @@ class CubistMagicController extends CubistCrudController
         | CrudPanel Configuration
         |--------------------------------------------------------------------------
         */
-        $this->crud->addColumn(['name' => $model->getPrimaryKey(), 'type' => 'number', 'label' => "#", 'searchLogic' => 'text']);
+        $this->crud->addColumn(['name' => $model->getPrimaryKey(), 'type' => 'number', 'label' => "#", 'thousands_sep' => '', 'searchLogic' => 'text']);
 
         $this->updateFieldsFromModel($model);
     }

diff --git a/src/app/Magic/Fields/Number.php b/src/app/Magic/Fields/Number.php
index 5ee0ddfc6eadad405e73a95570685c44b9f9dd0c..2d23c2d4253b43174f64f9cf06739e6683f8d3e9 100644 (file)
--- a/src/app/Magic/Fields/Number.php
+++ b/src/app/Magic/Fields/Number.php
@@ -29,4 +29,9 @@ class Number extends Field
         $res['attributes'] = array_merge($defaults, $res['attributes']);
         return $res;
     }
+
+    public function getColumnData()
+    {
+        return array_merge(parent::getColumnData(), ['thousands_sep' => '']);
+    }
 }

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index ce564a2b081521b7935a51682c0de1952cf85f95..0e5d50320e10705587a12edf776a07f70f08c538 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -803,4 +803,9 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         return true;
     }
 
+    public function addWidgets()
+    {
+
+    }
+
 }

diff --git a/src/resources/views/columns/select_from_array.blade.php b/src/resources/views/columns/select_from_array.blade.php
index 63070b181b646297631691316278d76ef47d1f0d..4ce99c3ffaae900759e6f30102568df3a57ed9a1 100644 (file)
--- a/src/resources/views/columns/select_from_array.blade.php
+++ b/src/resources/views/columns/select_from_array.blade.php
@@ -3,7 +3,7 @@
     $values = data_get($entry, $column['name']);
 @endphp
 
-<span>
+<span data-{{$entry->getOption('name')}}-{{$column['name']}}="{{$values}}">
        <?php
     if ($values !== null) {
         if (is_array($values)) {