From 5e5dbf1c4047cf1f6750319b8ce1bb98cad10e67 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 15 Jul 2024 16:01:23 +0200 Subject: [PATCH] wip #6998 @2 --- .../FluidbookPublication/PreviewOperation.php | 4 ++- app/Models/FluidbookPublication.php | 15 -------- app/Models/YSLSurvey.php | 35 ------------------- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 app/Models/YSLSurvey.php diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php index 7fbae2a6f..ca9d1efac 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php @@ -141,7 +141,9 @@ trait PreviewOperation $relayPath = $dest . '/' . $path; if (!file_exists($relayPath)) { - FluidbookHealthIssues::addIssue($fluidbook->id, FluidbookHealthIssues::TYPE_MISSING_FILE, ['path' => $path]); + if ($path !== 'index.html') { + FluidbookHealthIssues::addIssue($fluidbook->id, FluidbookHealthIssues::TYPE_MISSING_FILE, ['path' => $path]); + } abort(404, __('Ce fichier n\'existe pas')); } return XSendFileController::sendfile($relayPath); diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index 3bdcfe6b5..892b6b2b9 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -845,21 +845,6 @@ class FluidbookPublication extends ToolboxStatusModel // return true; } - /** - * @param $id - * @return FluidbookPublication - */ - public static function syncPublicationFromWorkshop($id) - { - return; - /** @var FluidbookPublication $fb */ - $fb = FluidbookPublication::withoutGlobalScopes()->find($id); - $fb?->syncFromWorkshop(); - - return FluidbookPublication::find($id); - } - - public function moveRegion($newRegion) { foreach (FluidbookDocument::withoutGlobalScopes()->whereIn('id', $this->getDocumentsId())->get() as $doc) { diff --git a/app/Models/YSLSurvey.php b/app/Models/YSLSurvey.php deleted file mode 100644 index 3e0eba122..000000000 --- a/app/Models/YSLSurvey.php +++ /dev/null @@ -1,35 +0,0 @@ - 'ysl-survey', - 'singular' => 'feeback', - 'plural' => 'feedbacks']; - - - protected static $_permissionBase = 'ysl-survey'; - - public function setFields() - { - parent::setFields(); - - $this->addField('fluidbook_id', FluidbookID::class, __('Fluidbook')); - $this->addField('page', Text::class, __('Page')); - $this->addField('rating', Integer::class, __('Note')); - $this->addField('suggestions', Textarea::class, __('Message')); - $this->addField('title', Text::class, __('Titre')); - $this->addField('function', Text::class, __('Fonction')); - $this->addField('country', Country::class, __('Pays')); - $this->addField('date', Integer::class, __('Date')); - } -} -- 2.39.5