diff --git a/app/Console/Commands/ResendArcadiaLinkMedias.php b/app/Console/Commands/ResendArcadiaLinkMedias.php new file mode 100644 index 0000000..56c5d00 --- /dev/null +++ b/app/Console/Commands/ResendArcadiaLinkMedias.php @@ -0,0 +1,54 @@ +=', '2025-10-23')->get(); + + foreach ($al as $error) + { + $media = Media::withTrashed()->find($error->media_id); + + if ($error->arcadia_id === 0) { + + ArcadiaLinkUtilities::create($media); + } else { + if (is_null($media->deleted_at)) { + ArcadiaLinkUtilities::update($media); + } else { + ArcadiaLinkUtilities::delete($media); + } + } + } + + return Command::SUCCESS; + } +} diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index e03487b..ca89f21 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -659,6 +659,12 @@ class MediaController extends Controller ]); } + if ($media->statut === MediaStatut::brouillon) { + throw ValidationException::withMessages([ + 'media' => trans('Ce média n\'est pas publié. Veuillez sauvegarder pour enregistrer le statut.') + ]); + } + MediaLinkWithArcadia::dispatch($user, $media); return response()->json(true); diff --git a/app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php index 3067029..5be1dc2 100644 --- a/app/Http/Controllers/UploadController.php +++ b/app/Http/Controllers/UploadController.php @@ -214,7 +214,7 @@ class UploadController extends Controller 'File guessed extensions :guessedExts does not match file name extension :extension', [ 'guessedExt' => $guessedExts, - 'extension' => $mediaExtension, + 'extension' => $mediaExtension->value, ] ) ]); diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index ff8f5dd..5fab7b2 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -190,10 +190,14 @@ class UserController extends Controller $marques = Marque::orderBy('libMarq', 'asc')->get(); $userSujets = $user->sujets; $sujets = Sujet::where('sujet_dam', true)->orderBy('libelle', 'asc')->get(); - $users = User::select(['id', 'email'])->whereIn('role', [ - config('roles.const.ADMIN'), config('roles.const.CONTRIBUTEUR'), - config('roles.const.REDACTEUR') - ])->where('id', '!=', $user->id)->get(); + $users = User::select(['id', 'email']) + ->whereIn('role', [ + config('roles.const.ADMIN'), config('roles.const.CONTRIBUTEUR'), + config('roles.const.REDACTEUR') + ]) + ->where('id', '!=', $user->id) + ->orderBy('email') + ->get(); return view('users.edit')->with([ 'user' => $user, 'roles' => $roles, 'users' => $users, 'userMarques' => $userMarques, 'marques' => $marques, diff --git a/app/Lib/ArcadiaLinkUtilities.php b/app/Lib/ArcadiaLinkUtilities.php index efcb775..9a96b80 100644 --- a/app/Lib/ArcadiaLinkUtilities.php +++ b/app/Lib/ArcadiaLinkUtilities.php @@ -132,7 +132,7 @@ class ArcadiaLinkUtilities $storage->path($filename), \ZipArchive::CREATE | \ZipArchive::OVERWRITE ); - $success = $zip->addFromString($xml, 'media.xml') && $success; + $success = $zip->addFromString('media.xml', $xml) && $success; $success = $zip->addFile($media->full_path, $media->basename) && $success; $success = $zip->close() && $success; unset($zip); @@ -245,7 +245,7 @@ class ArcadiaLinkUtilities ->appendChild($dom->createCDATASection($formatModel['hauteur'])); $format->appendChild($dom->createElement('lien')) ->appendChild($dom->createCDATASection(\sprintf( - "%s/{$media->folder}{$media->uid}_%s.{$media->extension->value}", + "%s/{$media->folder}/{$media->uid}_%s.{$media->extension->value}", config('app.url'), $formatModel['libelle'] ))); diff --git a/app/Models/Media.php b/app/Models/Media.php index 39a9770..b65a88c 100644 --- a/app/Models/Media.php +++ b/app/Models/Media.php @@ -267,8 +267,6 @@ class Media extends Model /** @throws \RuntimeException */ $model->removeFromElasticSearch(); - - $model->deleteFilesOnAllPath(); }); } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index cfd18e6..1ecd319 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -20,7 +20,7 @@ class AppServiceProvider extends ServiceProvider if ( in_array(config('app.env'), ['local', 'testing']) && config('app.bypassldap') && !app()->runningInConsole() ) { - Auth::loginUsingId(1); + Auth::loginUsingId(24); } // !!! Fuc**** Lab LDC exception OMG !!! diff --git a/resources/documents/arcadia/incoming_medias.xsd b/resources/documents/arcadia/incoming_medias.xsd index 64a8652..90ca2d0 100644 --- a/resources/documents/arcadia/incoming_medias.xsd +++ b/resources/documents/arcadia/incoming_medias.xsd @@ -1,12 +1,14 @@ - - - + + + + + @@ -16,5 +18,4 @@ - - + \ No newline at end of file diff --git a/resources/documents/arcadia/incoming_medias.xsd.ok_keep b/resources/documents/arcadia/incoming_medias.xsd.ok_keep new file mode 100644 index 0000000..64a8652 --- /dev/null +++ b/resources/documents/arcadia/incoming_medias.xsd.ok_keep @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue b/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue index 87edd59..5dfac03 100644 --- a/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue +++ b/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue @@ -73,7 +73,7 @@ required v-model="oMedia.type_vue_id" :disabled="oMedia.isLocked || oMedia.arcadia_id !== null" - @change="updateVariantes" + @change="oMedia.variante_id = null" >