From e44b21483b45a422c9d8077050283b5e071bc0bf Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 14 Feb 2024 13:13:49 +0100 Subject: [PATCH] wip #6627 @0.5 --- src/app/Models/Company.php | 8 +++++--- src/resources/views/columns/users.blade.php | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/Models/Company.php b/src/app/Models/Company.php index 5b8ff42..43f71ef 100644 --- a/src/app/Models/Company.php +++ b/src/app/Models/Company.php @@ -28,6 +28,8 @@ class Company extends CubistMagicAbstractModel protected $_enableDeletion = false; protected $_enableClone = false; + protected static $_ownerAttribute = 'admin'; + public function setFields() { parent::setFields(); @@ -60,7 +62,7 @@ class Company extends CubistMagicAbstractModel ] ); - $this->addField('marketing_force', Checkbox::class, __('Forcer l\'inscription aux listes marketing même si c\'est un client de revendeur'), ['default' => false, 'tab' => __('Informations')]); + $this->addField('marketing_force', Checkbox::class, __('Forcer l\'inscription aux listes marketing même si c\'est un client de revendeur'), ['default' => false, 'tab' => __('Informations'), 'can' => 'company:admin',]); $buid = null; if (null !== backpack_user()) { @@ -107,8 +109,8 @@ class Company extends CubistMagicAbstractModel 'tab' => __('Permissions')] ); - $this->addField('toolbox_access', Checkbox::class, __('Accès à la toolbox'), ['database_default' => 1, 'default' => 1, 'tab' => __('Permissions')]); - $this->addField('fluidbooks_managed', Text::class, __('Fluidbooks gérés'), ['tab' => __('Permissions')]); + $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', 'type' => 'BunchOfFields', diff --git a/src/resources/views/columns/users.blade.php b/src/resources/views/columns/users.blade.php index fc02d32..7bcb243 100644 --- a/src/resources/views/columns/users.blade.php +++ b/src/resources/views/columns/users.blade.php @@ -9,8 +9,12 @@ $user.=''; $user.=''.$name.' '; if($data['enabled']){ - $user.=' '; - $user.=' '; + if($id!==backpack_user()->id){ + $user.=' '; + } + if(can('user:admin')){ + $user.=' '; + } } $user.=''; -- 2.39.5