From baa37ccd0cab6f457f1db2c0b6c51652635eaac0 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 20 Jan 2022 21:11:08 +0100 Subject: [PATCH] wip #5041 @2 --- src/app/Magic/Models/CubistMagicAbstractModel.php | 2 +- src/app/Magic/Operations/CreateOperation.php | 2 +- src/resources/views/columns/select_from_array.blade.php | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php index 93b641d..f4edbaa 100644 --- a/src/app/Magic/Models/CubistMagicAbstractModel.php +++ b/src/app/Magic/Models/CubistMagicAbstractModel.php @@ -135,7 +135,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia $query->where('created_ok', 1); } - public function getOwnerAttribute() + public function getOwnerFieldName() { return static::$_ownerAttribute; } diff --git a/src/app/Magic/Operations/CreateOperation.php b/src/app/Magic/Operations/CreateOperation.php index 77c400c..a4036bd 100644 --- a/src/app/Magic/Operations/CreateOperation.php +++ b/src/app/Magic/Operations/CreateOperation.php @@ -22,7 +22,7 @@ trait CreateOperation $instance = $this->crud->model; if ($instance instanceof CubistMagicAbstractModel) { $instance->setAttribute('created_ok', '0'); - $ownerAttribute = $instance->getOwnerAttribute(); + $ownerAttribute = $instance->getOwnerFieldName(); if (null !== $ownerAttribute && $instance->hasField($ownerAttribute)) { $instance->setAttribute($ownerAttribute, backpack_user()->id); } diff --git a/src/resources/views/columns/select_from_array.blade.php b/src/resources/views/columns/select_from_array.blade.php index 4ce99c3..67b6cd6 100644 --- a/src/resources/views/columns/select_from_array.blade.php +++ b/src/resources/views/columns/select_from_array.blade.php @@ -18,10 +18,12 @@ if (isset($column['options'][$values])) { echo $column['options'][$values]; } else { + dd($values,$entry); echo '-'; } } } else { + dd($values); echo "-"; } ?> -- 2.39.5