]> _ Git - fluidbook-toolbox.git/commitdiff
wip #6316 @1
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 14 Nov 2023 12:54:39 +0000 (13:54 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 14 Nov 2023 12:54:39 +0000 (13:54 +0100)
app/Fluidbook/Compiler/Compiler.php
app/Fluidbook/Compiler/Stats.php
app/Http/Controllers/Admin/Operations/FluidbookPublication/LinksOperation.php

index 5c590ae8473e7789ef42dcb017976c78a9cf0fd2..1fa5cf63f5781c300088d0b4587874001400e9cf 100644 (file)
@@ -1531,7 +1531,7 @@ class Compiler extends Base implements CompilerInterface
             }
 
             if (!$reminimize) {
-                if (filemtime(__FILE__) > $mintime || (file_exists(__DIR__ . '/class.ws.html5.links.php') && filemtime(__DIR__ . '/class.ws.html5.links.php') > $mintime)) {
+                if (filemtime(__FILE__) > $mintime) {
                     $reminimize = true;
                 }
             }
index b75574e79ef9e7a93cb45bf0272ebcc2f4bd6c7a..0d2c91a7a8f63c03b99af0a99b2300ae024811a5 100644 (file)
@@ -69,7 +69,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
             }
         } else if ($this->fluidbookSettings->tagcommander_plan_type === 'esm') {
             $default = [
-                'env_ati_id' => 576078,
+                'env_ati_id' => 576089,
                 'page_name' => 'magazine',
                 'env_work' => $this->fluidbookSettings->tagcommander_prod ? 'prod' : 'pre-prod',
                 'page_level_name' => 'fluidbook',
@@ -81,7 +81,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
                 $id .= '/uat';
             }
             $scriptNames = ['tc_Multisite_Medias.js', 'tc_Multisite_Analytics.js'];
-            $this->addJsLib('esm', ['js/fluidbook/stats/fluidbook.stats.esm.js']);
+            $this->addJsLib('esm', ['js/libs/fluidbook/stats/fluidbook.stats.esm.js']);
         }
 
         if (isset($id)) {
index 8bae9ef5b1cce5d7a6f20e0427a10bf72b7e65b1..5c7e3036b5b380a6a5a1f49c27211b7771830e03 100644 (file)
@@ -62,7 +62,7 @@ trait LinksOperation
             json_decode(request('rulers', '[]'), true),
         );
 
-        $fb = FluidbookPublication::find($fluidbook_id);
+        $fb = FluidbookPublication::withoutGlobalScopes()->find($fluidbook_id);
         return response()->json(['assets' => $fb->getLinksAssetsDimensions(), 'versions' => LinksData::getLinksVersions($fluidbook_id)]);
     }