wip #7822 @3

diff --git a/src/app/Jobs/ApplyPermissionsToUsers.php b/src/app/Jobs/ApplyPermissionsToUsers.php
index 7cd9edc68a6abb52056e30384c8e436931b8e3b4..f4b2775218550bee58a2410d988dd54de5f7699a 100644 (file)
--- a/src/app/Jobs/ApplyPermissionsToUsers.php
+++ b/src/app/Jobs/ApplyPermissionsToUsers.php
@@ -41,6 +41,7 @@ class ApplyPermissionsToUsers extends Base implements ShouldBeUnique
             $rolesByName['fluidbook:reseller'],
             $rolesByName['fluidbook:reseller:create'],
             $rolesByName['elearning:user'],
+            $rolesByName['fluidbook:collection:write'],
         ];
 
         $superadmins = [5];
@@ -111,6 +112,9 @@ class ApplyPermissionsToUsers extends Base implements ShouldBeUnique
                         if ($isResselerClient) {
                             $p[] = $rolesByName['fluidbook:client'];
                         }
+                        if ($company->permission_collection) {
+                            $p[] = $rolesByName['fluidbook:collection:write'];
+                        }
                         switch ($company->e1_ws_grade) {
                             case 1:
                                 $p[] = $rolesByName['fluidbook:client'];

diff --git a/src/app/Models/Company.php b/src/app/Models/Company.php
index 63043cb94ee4889b5148e064026a8ff7bc4b46b3..79ad39324d969ec60b227daf14795e9b6add6db2 100644 (file)
--- a/src/app/Models/Company.php
+++ b/src/app/Models/Company.php
@@ -31,7 +31,7 @@ class Company extends CubistMagicAbstractModel
     protected $_enableDeletion = false;
     protected $_enableClone = false;
 
-    const FIRST_YEAR=2006;
+    const FIRST_YEAR = 2006;
 
     protected static $_ownerAttribute = 'admin';
 
@@ -90,6 +90,7 @@ class Company extends CubistMagicAbstractModel
                 'default' => false,
                 'databaseDefault' => false]);
 
+
         $this->addField(['name' => 'e1_ws_grade',
                 'label' => __('Permissions Fluidbook'),
                 'type' => 'SelectFromArray',
@@ -107,7 +108,8 @@ class Company extends CubistMagicAbstractModel
                 'can' => 'company:admin',
                 'tab' => __('Permissions')]
         );
-
+        $this->addField('permission_collection', Checkbox::class, __('Edition des collections'), ['can' => 'company:admin',
+            'tab' => __('Permissions')]);
         $this->addField(['name' => 'permissions_elearning',
                 'label' => __('Permissions e-Learning'),
                 'type' => 'Checkbox',
@@ -120,6 +122,7 @@ class Company extends CubistMagicAbstractModel
         );
 
         $this->addField('toolbox_access', Checkbox::class, __('Accès à la toolbox'), ['database_default' => 1, 'default' => 1, 'tab' => __('Permissions'), 'can' => 'company:admin',]);
+
         $this->addField('fluidbooks_managed', Text::class, __('Fluidbooks gérés'), ['tab' => __('Permissions'), 'can' => 'company:admin',]);
 
         $this->addField(['name' => 'address',