wait #6759 @1.5

diff --git a/app/Fields/CubedesignersTeamMember.php b/app/Fields/CubedesignersTeamMember.php
index d27164c011a0230f7624ecdabcc56a749cd2aee8..383e5d2758de8566552eded07cb851391726678e 100644 (file)
--- a/app/Fields/CubedesignersTeamMember.php
+++ b/app/Fields/CubedesignersTeamMember.php
@@ -7,6 +7,6 @@ class CubedesignersTeamMember extends User
     public function _postSetAttributes()
     {
         parent::_postSetAttributes();
-        $this->setAttribute('optionsmodel_scope', 'team');
+        $this->setAttribute('optionsmodel_scope', 'currentTeam');
     }
 }

diff --git a/app/Fields/FluidbookQuoteAdmin.php b/app/Fields/FluidbookQuoteAdmin.php
new file mode 100644 (file)
index 0000000..11ff62f
--- /dev/null
+++ b/app/Fields/FluidbookQuoteAdmin.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Fields;
+
+class FluidbookQuoteAdmin extends User
+{
+    public function _postSetAttributes()
+    {
+        parent::_postSetAttributes();
+        $this->setAttribute('optionsmodel_scope', 'quoteAdmin');
+    }
+}

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php
index 09937f812f904e9151671bbf7434711ac807bb16..50d5671cfd5a4aa43d31c91c613a9a98ac6ca6a3 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookCollection/DownloadOperation.php
@@ -3,15 +3,7 @@
 namespace App\Http\Controllers\Admin\Operations\FluidbookCollection;
 
 use App\Http\Controllers\Admin\Operations\Base\BaseDownloadOperation;
-use App\Http\Middleware\CheckIfAdmin;
 use App\Jobs\FluidbookCollectionDownload;
-use App\Jobs\FluidbookSettingsExport;
-use App\Jobs\QuizDownload;
-use App\Models\FluidbookCollection;
-use Cubist\Backpack\Http\Controllers\Base\XSendFileController;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Route;
-use Prologue\Alerts\Facades\Alert;
 
 // __('!! Collections de fluidbooks')
 

diff --git a/app/Models/FluidbookQuote.php b/app/Models/FluidbookQuote.php
index 59bf9d3a5b63041a6b88f5db5d39ec224ed22acc..c679b69bc6656a7375c4b81a6da4e9d8d7222865 100644 (file)
--- a/app/Models/FluidbookQuote.php
+++ b/app/Models/FluidbookQuote.php
@@ -3,6 +3,7 @@
 
 namespace App\Models;
 
+use App\Fields\FluidbookQuoteAdmin;
 use App\Fields\FluidbookQuoteOrigin;
 use App\Fields\FluidbookUser;
 use App\Http\Controllers\Admin\Operations\FluidbookQuote\AssignOperation;
@@ -16,6 +17,7 @@ use Cubist\Backpack\Magic\Fields\Integer;
 use Cubist\Backpack\Magic\Fields\ModelAttribute;
 use Cubist\Backpack\Magic\Fields\Number;
 use Cubist\Backpack\Magic\Fields\StaticValue;
+
 // __('!! Demandes de devis fluidbook')
 class FluidbookQuote extends ToolboxModel
 {
@@ -78,8 +80,12 @@ class FluidbookQuote extends ToolboxModel
 
         $this->addField('coupon', 'Hidden', __('Coupon'), ['can' => 'fluidbook-quote:admin',]);
 
-        $this->addField('admin', FluidbookUser::class, __('Administrateur'),
-            ['allows_null' => true, 'column_attribute' => 'firstname', 'column' => true, 'can' => 'fluidbook-quote:admin',]
+        $this->addField('admin', FluidbookQuoteAdmin::class, __('Administrateur'),
+            ['allows_null' => true,
+                'column_attribute' => 'firstname',
+                'column' => true,
+                'can' => 'fluidbook-quote:admin',
+                'filter' => true,]
         );
 
         $this->addField('reseller', FluidbookUser::class, __('Confiée à'),

diff --git a/app/Models/Traits/PublicationTags.php b/app/Models/Traits/PublicationTags.php
index 00b0831dedfd3f18cde33503481d55de09626b37..bd1f2f553a64dfeef8c19ae4637170a147a5e62a 100644 (file)
--- a/app/Models/Traits/PublicationTags.php
+++ b/app/Models/Traits/PublicationTags.php
@@ -68,6 +68,7 @@ trait PublicationTags
             'scorm' => __('SCORM / LMS'),
             'seo' => __('SEO'),
             'zoomarea' => __('Zone de zoom'),
+            '3d' => __('3D') . ', ' . __('Visite virtuelle') . ', ' . __('Réalité augmentée') . ' / ' . __('Réalité virtuelle'),
         ];
     }
 

diff --git a/app/Models/User.php b/app/Models/User.php
index 14a218daa2b5da7fbebce259aec52e879251fd41..87f4c1876c27c051401984f1650fa15defce2254 100644 (file)
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -30,6 +30,11 @@ class User extends \Cubedesigners\UserDatabase\Models\User
         $query->orderBy('id', 'ASC');
     }
 
+    public function scopeQuoteAdmin($query)
+    {
+        $this->scopeCurrentTeam($query);
+    }
+
     public function avatar()
     {
         try {