fix: many fixes from develop branch + new re7 feedbacks

This commit is contained in:
Noah Lancien 2025-05-06 10:55:59 +02:00
parent ad00dd2246
commit 0984fa00b7
5 changed files with 5 additions and 7 deletions

View file

@ -499,6 +499,8 @@ class MediaController extends Controller
// ---- Creation des vignettes en lien avec le sujet du média
$clonedMedia->createSubjectThumbnails();
$clonedMedia->isDuplicate = true;
$clonedMedia->save();
// * Add relations after having a media id

View file

@ -807,7 +807,7 @@ class Media extends Model
$storage = Storage::disk('media');
// * format spécifique
if ($format->system) {
if (!$format->system) {
if (in_array($this->extension, ['gif', 'jpeg', 'jpg', 'png', 'pdf', 'ai', 'psd'])) {
return $storage->path("/{$this->folder}/{$this->uid}_{$format->libelle}.{$format->extension->value}");
}
@ -822,7 +822,7 @@ class Media extends Model
} elseif (in_array($this->extension, ['pdf', 'ai', 'psd'])) {
return $storage->path("/{$this->folder}/{$this->uid}_{$format->libelle}.png");
}
return $storage->path("/{$this->folder}/{$this->uid}.{$this->extension}");
return $storage->path("/{$this->folder}/{$this->uid}.{$this->extension->value}");
}
throw new \RuntimeException("Unhandled Format $format->id $format->libelle");
}

View file

@ -489,9 +489,6 @@ export default {
.querySelector('meta[name="csrf-token"]')
.getAttribute("content"),
},
query: {
media_id: this.storeMedia.id
}
});
this.resumable.on("fileAdded", this.uploadFileAdded);

View file

@ -184,7 +184,7 @@ export default {
},
mounted() {
const data = JSON.parse(this.$parent.$options.json);
if (data.selectedFolder) {
if (data.selectedFolder && data.selectedFolder != -1) {
this.selectedFolder = data.selectedFolder;
this.selectFolder(data.selectedFolder);
this.$store.commit({

View file

@ -26,7 +26,6 @@
'textsearch' => $textSearch,
'typesmedia' => $typesmedia,
'etiquettes' => $etiquettes,
'selectedFolder' => $currentFolder,
];
@endphp
<div id="mm-filters" data-json='@json($dataVue)'></div>