wait #4977 @0.25

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644 (file)
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file

diff --git a/app/Fields/FluidbookUser.php b/app/Fields/FluidbookUser.php
new file mode 100644 (file)
index 0000000..408f69f
--- /dev/null
+++ b/app/Fields/FluidbookUser.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Fields;
+
+use Cubist\Backpack\Magic\Fields\SelectFromModel;
+
+class FluidbookUser extends SelectFromModel
+{
+    protected $_optionsmodel = \App\Models\User::class;
+
+    public function getDefaultAttributes()
+    {
+        $default = ['optionsmodel' => $this->_optionsmodel,
+            'attribute' => 'nameWithCompany',
+            'column_attribute' => 'CompanyWithNameOnTwoLines',
+        ];
+        return array_merge(parent::getDefaultAttributes(), $default);
+    }
+}

diff --git a/app/Models/FluidbookQuote.php b/app/Models/FluidbookQuote.php
index 38de0f4bc4ebaf303276762b44fbbece7bbbd0ba..88e21f97c27b98613d0c35d8308349826d2a36c0 100644 (file)
--- a/app/Models/FluidbookQuote.php
+++ b/app/Models/FluidbookQuote.php
@@ -4,6 +4,7 @@
 namespace App\Models;
 
 use App\Fields\FluidbookQuoteOrigin;
+use App\Fields\FluidbookUser;
 use App\Http\Controllers\Admin\Operations\FluidbookQuote\AssignOperation;
 use App\Http\Controllers\Admin\Operations\FluidbookQuote\ConfirmAssignmentOperation;
 use App\Http\Controllers\Admin\Operations\FluidbookQuote\CreateFromWebsite;
@@ -45,12 +46,10 @@ class FluidbookQuote extends CubistMagicAbstractModel
         $this->addField('links', 'Hidden');
         $this->addField('langs', 'Hidden');
 
-        $this->addField('user', 'SelectFromModel', __('Utilisateur'),
+        $this->addField('user', FluidbookUser::class, __('Utilisateur'),
             [
-                'optionsmodel' => User::class,
                 'optionsmodel_global_scopes' => false,
                 'attribute' => 'companyWithName',
-                'column_attribute' => 'CompanyWithNameOnTwoLines',
                 'column' => true,
                 'can_write' => 'fluidbook-quote:admin',
             ]);
@@ -80,12 +79,12 @@ class FluidbookQuote extends CubistMagicAbstractModel
 
         $this->addField('coupon', 'Hidden', __('Coupon'), ['can' => 'fluidbook-quote:admin',]);
 
-        $this->addField('admin', 'SelectFromModel', __('Administrateur'),
-            ['optionsmodel' => User::class, 'allows_null' => true, 'attribute' => 'nameWithCompany', 'column_attribute' => 'firstname', 'column' => true, 'can' => 'fluidbook-quote:admin',]
+        $this->addField('admin', FluidbookUser::class, __('Administrateur'),
+            ['allows_null' => true, 'column_attribute' => 'firstname', 'column' => true, 'can' => 'fluidbook-quote:admin',]
         );
 
-        $this->addField('reseller', 'SelectFromModel', __('Confiée à'),
-            ['optionsmodel' => User::class, 'allows_null' => true, 'attribute' => 'nameWithCompany', 'column_attribute' => 'CompanyWithNameOnTwoLines', 'column' => true, 'can' => 'fluidbook-quote:admin',]);
+        $this->addField('reseller', FluidbookUser::class, __('Confiée à'),
+            ['allows_null' => true, 'column' => true, 'can' => 'fluidbook-quote:admin',]);
 
         $this->addField('status', 'SelectFromArray', __('Status'), ['options' => [
             0 => __('A confier'),