From: soufiane <soufiane@cubedesigners.com>
Date: Tue, 19 Dec 2023 18:06:46 +0000 (+0100)
Subject: wait #6482 correctif accès à la class utilisateur
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c158d21b510d06b20cd190523027d45b98b465d9;p=fluidbook-toolbox.git

wait #6482 correctif accès à la class utilisateur
---

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
index 55ffeccc5..d409edb6e 100644
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php
@@ -302,7 +302,6 @@ trait LinksOperation
         $token = $request->token;
         $userId = backpack_user()->id;
 
-
         if(cache()->get('connexion_multiple'.$fluidbookId) !== null) {
             if(cache()->has('connexion_multiple'.$fluidbookId) && intval($request->tabOpen) > 0) {
                 cache()->increment('connexion_multiple'.$fluidbookId, 1);
@@ -322,7 +321,7 @@ trait LinksOperation
         $connexionMultipleExist = cache()->get('connexion_multiple'.$fluidbookId);
 
         if($connexionExist && $fluidbookId === $connexionExist['f_id']) {
-            $user = User::find($connexionExist['id']);
+            $user = User::withoutGlobalScopes()->find($connexionExist['id']);
             $user = $user->firstname.' '.$user->lastname;
 
             if($userId != $connexionExist['id'] || ($connexionMultipleExist > 1 && $token !== $connexionExist['token'])) {
@@ -335,7 +334,7 @@ trait LinksOperation
                 $token = Str::random(10);
             }
             cache(['connexion'.$fluidbookId => ['id' => $userId, 'token' => $token,'f_id' => $fluidbookId] ]);
-            return json_encode(["status"=>"available",$connexionExist]);
+            return json_encode(["status"=>"available",cache()->get('connexion'.$fluidbookId)]);
         }
     }
 
diff --git a/resources/linkeditor/js/linkeditor.js b/resources/linkeditor/js/linkeditor.js
index fdfa18b2d..be2ce4284 100644
--- a/resources/linkeditor/js/linkeditor.js
+++ b/resources/linkeditor/js/linkeditor.js
@@ -578,6 +578,7 @@ $(function () {
     let userID = $("#userID").data('id')
     let tabClosed = 0
     let tabOpen = 1
+    let interval = null
 
     function intervalConnection(data = {}) {
         tabClosed = localStorage.getItem("tabClosed")
@@ -623,7 +624,7 @@ $(function () {
             setTimeout(function () { intervalConnection(); }, 1000)
         });
     }
-    setTimeout(function () { intervalConnection() }, 1000)
+    interval = setTimeout(function () { intervalConnection() }, 1000)
 
     //
     $("body").on("click", "#connectTo", function(e) {
@@ -633,6 +634,7 @@ $(function () {
 
     //
     $(window).on("unload",function(){
+        clearTimeout(interval)
         localStorage.setItem('tabClosed', "1")
     })