From: soufiane <soufiane@cubedesigners.com>
Date: Mon, 18 Dec 2023 11:49:06 +0000 (+0100)
Subject: wait #6482 @0:30
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5a1f3b25111f6110e1320a737156c2a292b0c614;p=fluidbook-toolbox.git

wait #6482 @0:30
---

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
index 7eda716e6..55ffeccc5 100644
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
@@ -301,8 +301,7 @@ trait LinksOperation
         $fluidbookId = $request->id;
         $token = $request->token;
         $userId = backpack_user()->id;
-        $user = User::find($userId);
-        $user = $user->firstname.' '.$user->lastname;
+
 
         if(cache()->get('connexion_multiple'.$fluidbookId) !== null) {
             if(cache()->has('connexion_multiple'.$fluidbookId) && intval($request->tabOpen) > 0) {
@@ -323,6 +322,9 @@ trait LinksOperation
         $connexionMultipleExist = cache()->get('connexion_multiple'.$fluidbookId);
 
         if($connexionExist && $fluidbookId === $connexionExist['f_id']) {
+            $user = User::find($connexionExist['id']);
+            $user = $user->firstname.' '.$user->lastname;
+
             if($userId != $connexionExist['id'] || ($connexionMultipleExist > 1 && $token !== $connexionExist['token'])) {
                 return json_encode(["status"=>"unavailable","infos_connection"=>array_merge(["user" => $user],$connexionExist)]);
             } else {
diff --git a/resources/views/fluidbook_publication/link_editor.blade.php b/resources/views/fluidbook_publication/link_editor.blade.php
index 92401dc0e..773b09fe4 100644
--- a/resources/views/fluidbook_publication/link_editor.blade.php
+++ b/resources/views/fluidbook_publication/link_editor.blade.php
@@ -169,7 +169,7 @@
         </div>
 
         <div class="popup" data-popup="unavailable" style="max-width: 300px">
-            <h2>{{__('Fluidbook en cours d\'utilisation')}}</h2>
+            <h2>{{__('Fluidbook en cours d\'édition')}}</h2>
             <p>{{__('Utilisateur : ')}} <span id="username"></span></p>
             <p>Identifiant: <span id="id"></span></p>
             @if($u->hasPermissionTo('fluidbook-publication:admin'))