wait #5755 @0.5

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 436de7f2904e61f631c1b290b440e158497829a5..ef0700147e5499f450fe5e4888190228c7534724 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -102,16 +102,6 @@ class FluidbookPublication extends ToolboxSettingsModel
 
         $this->addField('section_infos', FormBigSection::class, __('Administration'));
 
-        $this->addField(['name' => 'c_admin',
-                'label' => __('Administrateur'),
-                'read_only' => true,
-                'type' => User::class,
-                'column' => true,
-                'can' => 'fluidbook-publication:admin',
-                'column_attribute' => 'companyWithNameOnTwoLines',
-                'attribute' => 'companyWithName',
-            ]
-        );
 
         $this->addField('visits_counter', Integer::class, 'Compteur de visites', ['read_only' => true, 'default' => 0, 'column' => true, 'column_label' => '<i class="las la-chart-area" title="Compteur de visites du lien de préview"></i>']);
 
@@ -124,13 +114,35 @@ class FluidbookPublication extends ToolboxSettingsModel
         $this->addField('hash', Hidden::class);
         $this->addField('cid', Hidden::class);
 
-
         $this->addField('extranet_task', Hidden::class, __('Tâche de l\'extranet'));
         $this->addField('export_data', Hidden::class, __('Paramètres d\'export'));
         // Composed fields
-        $composed = ['admin' => __('Administrator'), 'super_admin' => __('Super administrator'), 'owner_company_name' => __('Propriétaire'), 'owner_name' => __('Propriétaire'), 'invoicable' => __('Utilisateur facturable'), 'invoicable_company' => __('Facturation'), 'extranet_project' => __('Project extranet')];
+        $composed = ['admin' => [
+            'label' => __('Administrateur'),
+            'read_only' => true,
+            'type' => User::class,
+            'column' => true,
+            'can' => 'fluidbook-publication:admin',
+            'column_attribute' => 'companyWithNameOnTwoLines',
+            'column_move_after' => 'owner',
+            'attribute' => 'companyWithName',
+        ],
+            'super_admin' => __('Super administrateur'),
+            'owner_company_name' => __('Propriétaire'),
+            'owner_name' => __('Propriétaire'),
+            'invoicable' => __('Utilisateur facturable'),
+            'invoicable_company' => __('Facturation'),
+            'extranet_project' => __('Project extranet')
+        ];
+
         foreach ($composed as $name => $label) {
-            $this->addField($name, Hidden::class, $label);
+            $defaultAttributes = ['name' => $name, 'type' => Hidden::class];
+            if (is_string($label)) {
+                $attributes = array_merge($defaultAttributes, ['label' => $label]);
+            } else if (is_array($label)) {
+                $attributes = array_merge($defaultAttributes, $label);
+            }
+            $this->addField($attributes);
         }
     }