wip #3274 @0.5

diff --git a/src/app/Magic/Fields/SiteVariant.php b/src/app/Magic/Fields/SiteVariant.php
index 42f0fa9afa0eb7ad5b76a79978c7c555f81c13dd..d624633d8f7ec3b246955e7a218826fac908bf1f 100644 (file)
--- 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 a2e46d95ecb89f407f44b561ba59de1df080eb1d..03d40c46387cc794c82ae0416aeb4fac5fe9de52 100644 (file)
--- 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()