Merge branch 'fix/conditionDynamicPageHelper' into 'dynamic-pages'
fix: add condition to the dynamicPageHelper in the removeImgs fonction See merge request ldc-web/projets/ldc!53
This commit is contained in:
commit
2c819672a8
1 changed files with 10 additions and 8 deletions
|
|
@ -24,10 +24,12 @@ class DynamicPageHelper
|
|||
$currentContent = json_decode($model->getAttributes()['content'], true);
|
||||
$originalContent = $model->getOriginal('content');
|
||||
|
||||
$currentContentLocal = is_array($currentContent[$locale]) ? $currentContent[$locale] : ["text_" => $currentContent[$locale]];
|
||||
$originalContentLocal = is_array($originalContent[$locale]) ? $originalContent[$locale] : ["text_" => $originalContent[$locale]];
|
||||
static::removeDynamicImages($model, $originalContentLocal, $currentContentLocal, $forceDeleteImage);
|
||||
static::removeWysiwygImages($originalContentLocal, $currentContentLocal);
|
||||
if (isset($originalContent[$locale])) {
|
||||
$currentContentLocal = is_array($currentContent[$locale]) ? $currentContent[$locale] : ["text_" => $currentContent[$locale]];
|
||||
$originalContentLocal = is_array($originalContent[$locale]) ? $originalContent[$locale] : ["text_" => $originalContent[$locale]];
|
||||
static::removeDynamicImages($model, $originalContentLocal, $currentContentLocal, $forceDeleteImage);
|
||||
static::removeWysiwygImages($originalContentLocal, $currentContentLocal);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -80,10 +82,10 @@ class DynamicPageHelper
|
|||
$prefix = DynamicFieldTypes::text->name . '_';
|
||||
|
||||
static::getDynamicFieldKeys($oldContent, $newContent, $prefix)
|
||||
->each(function ($key) use ($oldContent) {
|
||||
$old = $oldContent[$key] ?? null;
|
||||
FileHelper::removeOldModelFilesFromHtml('', $old);
|
||||
});
|
||||
->each(function ($key) use ($oldContent) {
|
||||
$old = $oldContent[$key] ?? null;
|
||||
FileHelper::removeOldModelFilesFromHtml('', $old);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue