From: Vincent Vanwaelscappel Date: Mon, 20 Oct 2025 17:36:15 +0000 (+0200) Subject: wip #7772 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f7e17911db1b7afe2c3af7ea35130d10c522c75e;p=fluidbook-toolbox.git wip #7772 @2 --- diff --git a/app/Fluidbook/Farm.php b/app/Fluidbook/Farm.php index 122f83a6d..5c3e5c811 100644 --- a/app/Fluidbook/Farm.php +++ b/app/Fluidbook/Farm.php @@ -21,7 +21,7 @@ class Farm protected static $_region = Region::EUROPE; protected static $_farmServers = [ - ['name' => 'amadeus', 'host' => 'amadeus.cubedesigners.com', 'weight' => 1, 'region' => Region::EUROPE, 'local' => false], + ['name' => 'amadeus', 'host' => 'amadeus.cubedesigners.com', 'weight' => 0, 'region' => Region::EUROPE, 'local' => false], ['name' => 'benhur', 'host' => 'benhur.cubedesigners.com', 'weight' => 8, 'region' => Region::EUROPE, 'local' => false], ['name' => 'cloudatlas', 'host' => 'cloudatlas.cubedesigners.com', 'weight' => 2, 'region' => Region::EUROPE, 'local' => false], ['name' => 'dobermann', 'host' => 'dobermann.cubedesigners.com', 'weight' => 6, 'region' => Region::EUROPE, 'local' => false], @@ -83,11 +83,21 @@ class Farm } $pings = json_decode(file_get_contents(self::_pingCache())); + $restoreForceServer = false; + + if (!self::$_forceServer && $params['operation'] === 'extractmarkdown') { + $restoreForceServer = self::$_forceServer; + //self::$_forceServer = "amadeus"; + } + foreach (self::$_farmServers as $k => $farmServer) { if (!isset($pings[$k]) || !$pings[$k]) { continue; } if (self::$_forceServer && $farmServer['name'] === self::$_forceServer) { + if ($restoreForceServer) { + self::$_forceServer = $restoreForceServer; + } return $farmServer; } if ($preferLocal && $farmServer['local'] && $farmServer['region'] === self::getRegion()) { diff --git a/resources/views/fields/fluidbook_composition.blade.php b/resources/views/fields/fluidbook_composition.blade.php index 6ab261c93..e4bcaf2a8 100644 --- a/resources/views/fields/fluidbook_composition.blade.php +++ b/resources/views/fields/fluidbook_composition.blade.php @@ -495,6 +495,12 @@ window.open('/fluidbook-publication/' + {{$entry->id}} + '/links/' + ($(opt.$trigger[0]).index() + 1) + '.csv'); }, }, + accessible: { + name: "{{__('Contenus accessibles')}}", + callback: function (key, opt) { + window.open('/fluidbook-publication/' + {{$entry->id}} + '/accessible/' + ($(opt.$trigger[0]).index() + 1) + '.md'); + } + } } } };