From a86c46f64b38312ddc369f8ad31c08c007c4992a Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 7 Jan 2020 20:06:32 +0100 Subject: [PATCH] wip #3274 @0.5 --- src/app/Magic/Fields/SiteVariant.php | 11 ++++++++--- src/app/Magic/Models/CubistMagicPageModel.php | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/app/Magic/Fields/SiteVariant.php b/src/app/Magic/Fields/SiteVariant.php index 42f0fa9..d624633 100644 --- a/src/app/Magic/Fields/SiteVariant.php +++ b/src/app/Magic/Fields/SiteVariant.php @@ -7,15 +7,20 @@ use Illuminate\Support\Facades\App; class SiteVariant extends SelectFromArray { + protected $_allowNull = false; + public function __construct($attributes) { $variants = App::getVariants(); if (count($variants) === 0) { + $this->_viewNamespace = 'crud::fields'; $attributes['column'] = false; - $this->_adminType = 'hidden'; - $this->_options = ['default' => 'default']; + $attributes['type'] = 'hidden'; + $attributes['options'] = ['default' => 'default']; + $attributes['default'] = 'default'; } else { - $this->_options = array_combine($variants, $variants); + $attributes['options'] = array_combine($variants, $variants); + $attributes['default'] = array_values($attributes['options']); } parent::__construct($attributes); } diff --git a/src/app/Magic/Models/CubistMagicPageModel.php b/src/app/Magic/Models/CubistMagicPageModel.php index a2e46d9..03d40c4 100644 --- a/src/app/Magic/Models/CubistMagicPageModel.php +++ b/src/app/Magic/Models/CubistMagicPageModel.php @@ -48,6 +48,12 @@ class CubistMagicPageModel extends CubistMagicTranslatableModel 'allows_null' => false, 'options' => $options, 'tab' => $tab]); + + $this->addField(['name' => 'variant', + 'type' => 'SiteVariantMultiple', + 'label' => 'Variante du site', + 'translatable' => false, + 'tab' => $tab]); } protected function _internalSearch() -- 2.39.5