From: Vincent Vanwaelscappel Date: Fri, 21 Nov 2025 17:15:01 +0000 (+0100) Subject: wip #7822 @3 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f49de7eccf4c82f8009cf119bf5bb001b6ed2ea8;p=cubedesigners_userdatabase.git wip #7822 @3 --- diff --git a/src/app/Jobs/ApplyPermissionsToUsers.php b/src/app/Jobs/ApplyPermissionsToUsers.php index 7cd9edc..f4b2775 100644 --- 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 63043cb..79ad393 100644 --- 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',