wip #6727 @2

diff --git a/src/app/Jobs/ApplyPermissionsToUsers.php b/src/app/Jobs/ApplyPermissionsToUsers.php
index 5cfed0f54132b9140772e80896bd2cf1bcde7fe3..fe55f69056c1ecaef6b25a9a208c7e2246e91753 100644 (file)
--- a/src/app/Jobs/ApplyPermissionsToUsers.php
+++ b/src/app/Jobs/ApplyPermissionsToUsers.php
@@ -158,10 +158,10 @@ class ApplyPermissionsToUsers extends Base implements ShouldBeUnique
         $rows = [];
         foreach ($addPermissions as $id => $roles) {
             foreach ($roles as $role) {
-                $rows[] = ['model_id' => $id, 'role_id' => $role, 'model_type' => $modelType];
+                $rows[$id . '_' . $role . '_' . $modelType] = ['model_id' => $id, 'role_id' => $role, 'model_type' => $modelType];
             }
         }
-        DB::connection('extranet_users')->table('model_has_roles')->insert($rows);
+        DB::connection('extranet_users')->table('model_has_roles')->insert(array_values($rows));
         Artisan::call('permission:cache-reset');
         dispatch(new URL('https://workshop.fluidbook.com/maintenance/refreshUsersTree'));
     }

diff --git a/src/app/Models/User.php b/src/app/Models/User.php
index c08887e1646da704ff81fa6de8c17558693898ca..debe6a1d9319f630d7b9ece099393b994afa9bce 100644 (file)
--- a/src/app/Models/User.php
+++ b/src/app/Models/User.php
@@ -63,7 +63,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
             'type' => 'SelectFromModel',
             'optionsmodel' => Company::class,
             'tab' => __('Contact'),
-            'column' => true, 'can' => 'users:admin',
+            'column' => true, 'can_hidden' => 'users:admin',
         ]);
 
         $this->addField(['name' => 'address',

diff --git a/src/resources/views/fields/users.blade.php b/src/resources/views/fields/users.blade.php
index 370e79d006969425473dcf11a237ea196e478e3e..98c9b303796752f79de0d5334c4678773cf7ac03 100644 (file)
--- a/src/resources/views/fields/users.blade.php
+++ b/src/resources/views/fields/users.blade.php
@@ -6,7 +6,7 @@
                href="{!! backpack_url('users/createfromcompany/'.$entry->id.'?embeded=1') !!}"
                class="btn btn-light btn-small"><i class="la la-plus"></i> {{__('Ajouter un contact')}}</a>
         </div>
-        <table id="cubedesigners-user-list">
+        <table id="cubedesigners-user-list" data-reload-portion >
             @foreach($entry->getUsers() as $id=>$user)
                 <tr>
                     <td @if(!$user['enabled']) class="disabled" @endif>{{$id}}</td>