minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: fix unassigning related files

Browse Source
This commit is contained in:
Michal Kváček
2017-02-23 18:24:35 +01:00
parent 507e186713
commit f90df0f4bc
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CMS/Interactions/Admin/Content/EditContent.php
+1 -1
View File
@@ -61,7 +61,7 @@ class EditContent implements Interaction
$this->module->callOnString($page->moduleHandler, 'edit', [$page, $data]); $this->module->callOnString($page->moduleHandler, 'edit', [$page, $data]);
// move to interaction // move to interaction
$keepAssigned = isset($data->keepAssigned) ? $data->keepAssigned : []; $keepAssigned = isset($data['keepAssigned']) ? $data['keepAssigned'] : [];
$page->uploadRelatedFiles($relatedFiles, $keepAssigned); $page->uploadRelatedFiles($relatedFiles, $keepAssigned);
} }
app/Models/Content/ModelTraits/Content.php
+2 -6
View File
@@ -22,9 +22,7 @@ trait Content
$changed = 0; $changed = 0;
// check if any file was removed // check if any file was removed
if ($revisionId) { $changed += $this->removeRelatedFiles($revisionId, $assignedFiles);
$changed += $this->removeRelatedFiles($revisionId, $assignedFiles);
}
// allow uploading only on created pages // allow uploading only on created pages
if (!$this->id || !$files[0]) { if (!$this->id || !$files[0]) {
@@ -73,12 +71,10 @@ trait Content
private function removeRelatedFiles($revisionId, $assignedFiles) private function removeRelatedFiles($revisionId, $assignedFiles)
{ {
$allFiles = $this->files() $allFiles = $this->files()
->whereNotIn('id', $assignedFiles) ->whereNotIn('id', array_keys($assignedFiles))
->get(); ->get();
foreach ($allFiles as $file) { foreach ($allFiles as $file) {
$this->saveHistory($revisionId, 'file', $file->original_filename, ['file' => null]);
ContentHasFile::where('content_id', $this->id) ContentHasFile::where('content_id', $this->id)
->where('file_id', $file->id) ->where('file_id', $file->id)
->delete(); ->delete();