From 3b8813cfdacc27a5a67ca41c9860430750b361b5 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 30 Nov 2023 16:10:42 +0100 Subject: [PATCH] wait #6527 @0.5 --- app/Fluidbook/Compiler/Compiler.php | 2 +- .../crud/inc/form_save_buttons.blade.php | 280 +++++++++--------- 2 files changed, 144 insertions(+), 138 deletions(-) diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php index 3551bbb75..6b9401f5d 100644 --- a/app/Fluidbook/Compiler/Compiler.php +++ b/app/Fluidbook/Compiler/Compiler.php @@ -2437,7 +2437,7 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError public static function getSourcesPath($version, $dir = null) { - $res = self::getFluidbookPlayerBaseDirectory(); + $res = self::getPlayerBaseDirectory(); if (null !== $dir) { $res .= $dir . '/'; } diff --git a/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php b/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php index 722edb899..4e09d955c 100644 --- a/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php +++ b/resources/views/vendor/backpack/crud/inc/form_save_buttons.blade.php @@ -8,8 +8,9 @@ @endphp @if(isset($saveAction['active']) && !is_null($saveAction['active']['value']))
- @if($crud->entry->getTable() === "fluidbook_external_install_server") - {{ __('Tester la connexion') }} + @if($crud->entry && $crud->entry instanceof \App\Models\FluidbookExternalInstallServer) + {{ __('Tester la connexion') }} @endif @if(!empty($saveAction['options'])) @@ -23,10 +24,13 @@
@if(!empty($saveAction['options'])) - - @endif @@ -76,153 +82,153 @@ @endpush @endif @push('after_scripts') - + -@if ($crud->get('update.showDeleteButton') && $crud->get('delete.configuration') && $crud->hasAccess('delete')) - -@endif + }); + } + }); + } + + @endif @endpush -- 2.39.5