wait #6374 @0.75

diff --git a/app/Http/Controllers/Admin/Operations/ChangeownerOperation.php b/app/Http/Controllers/Admin/Operations/ChangeownerOperation.php
index a6fc466b2bdc1c3af6494fdcd1e2c3fad948e6c7..452edd28b64649d1e0e5ff62f002b0b476f2834e 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/ChangeownerOperation.php
+++ b/app/Http/Controllers/Admin/Operations/ChangeownerOperation.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Admin\Operations;
 
-use Backpack\CRUD\app\Library\CrudPanel\CrudPanel;
 use Cubist\Backpack\Magic\Controllers\CubistMagicController;
 use Illuminate\Support\Facades\Route;
 use Prologue\Alerts\Facades\Alert;

diff --git a/app/Models/Base/ToolboxModel.php b/app/Models/Base/ToolboxModel.php
index cdfb1e694c690b9af85bfcc8569abd78a7e315b1..449110ba02f54749a58029b9d1663aac3fa86e85 100644 (file)
--- a/app/Models/Base/ToolboxModel.php
+++ b/app/Models/Base/ToolboxModel.php
@@ -64,13 +64,19 @@ class ToolboxModel extends CubistMagicAbstractModel
 
     public function addOwnerField($options = [])
     {
+        if (can(static::$_permissionBase . ':admin')) {
+            $columnAttribute = 'allTreeInfos';
+        } else {
+            $columnAttribute = 'basicTreeInfos';
+        }
+
         $fieldSettings = [
             'name' => static::$_ownerAttribute,
             'label' => __('Propriétaire'),
             'type' => Owner::class,
             'column' => true,
-            'can' => static::$_permissionBase . ':admin',
-            'column_attribute' => 'companyWithNameOnTwoLines',
+            'can' => static::$_permissionBase . ':set-owner',
+            'column_attribute' => $columnAttribute,
             'column_escape' => false,
             'attribute' => 'companyWithName',
             'default' => Auth::id(),

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 249990bb59825561b956a9b0fc43a8740a145ac6..4d596993a3693cb05b4764051338a88a80e77c4e 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -192,7 +192,7 @@ class FluidbookPublication extends ToolboxSettingsModel
             $this->addField($attributes);
         }
 
-        $this->addOwnerField(['column_attribute' => 'allTreeInfos']);
+        $this->addOwnerField();
 
         $this->addField('region', SelectFromArray::class, __('Région d\'hébergement des données'), ['options' => ['UE' => __('Union européenne'), 'US' => 'USA'], 'default' => 'UE', 'allows_null' => false, 'databaseDefault' => 'UE']);
         $this->addField('status', FluidbookStatus::class, __('Status'), [