Skip to content

Commit fe286f0

Browse files
committed
fix(entries-controller) fix issue non exists media folders on entries actions
1 parent 4e1f704 commit fe286f0

File tree

1 file changed

+24
-7
lines changed

1 file changed

+24
-7
lines changed

app/Controllers/EntriesController.php

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,10 @@ public function moveProcess(Request $request, Response $response)
515515
$data['entry_id_path_current'],
516516
$data['parent_entry'] . '/' . $entry_id_current
517517
)) {
518+
if (! flextype('media')->folders()->has('entries/' . $data['entry_id_path_current'])) {
519+
flextype('media')->folders()->create('entries/' . $data['entry_id_path_current']);
520+
}
521+
518522
flextype('media')->folders()->move('entries/' . $data['entry_id_path_current'], 'entries/' . $data['parent_entry'] . '/' . $entry_id_current);
519523

520524
flextype('flash')->addMessage('success', __('admin_message_entry_moved'));
@@ -601,7 +605,12 @@ public function renameProcess(Request $request, Response $response) : Response
601605
$data['entry_path_current'],
602606
$data['entry_parent'] . '/' . $name)
603607
) {
604-
flextype('media')->folders()->move('entries/' . $data['entry_path_current'], 'entries/' . $data['entry_parent'] . '/' . flextype('slugify')->slugify($data['name']));
608+
if (! flextype('media')->folders()->has('entries/' . $data['entry_path_current'])) {
609+
flextype('media')->folders()->create('entries/' . $data['entry_path_current']);
610+
}
611+
612+
flextype('media')->folders()->move('entries/' . $data['entry_path_current'],
613+
'entries/' . $data['entry_parent'] . '/' . flextype('slugify')->slugify($data['name']));
605614
flextype('flash')->addMessage('success', __('admin_message_entry_renamed'));
606615
} else {
607616
flextype('flash')->addMessage('error', __('admin_message_entry_was_not_renamed'));
@@ -627,6 +636,10 @@ public function deleteProcess(Request $request, Response $response) : Response
627636

628637
if (flextype('entries')->delete($id)) {
629638

639+
if (! flextype('media')->folders()->has('entries/' . $id)) {
640+
flextype('media')->folders()->create('entries/' . $id);
641+
}
642+
630643
flextype('media')->folders()->delete('entries/' . $id);
631644

632645
flextype('flash')->addMessage('success', __('admin_message_entry_deleted'));
@@ -655,6 +668,11 @@ public function duplicateProcess(Request $request, Response $response) : Respons
655668
$random_date = date("Ymd_His");
656669

657670
flextype('entries')->copy($id, $id . '-duplicate-' . $random_date, true);
671+
672+
if (! flextype('media')->folders()->has('entries/' . $id)) {
673+
flextype('media')->folders()->create('entries/' . $id);
674+
}
675+
658676
flextype('media')->folders()->copy('entries/' . $id, 'entries/' . $id . '-duplicate-' . $random_date, true);
659677

660678
if (Filesystem::has(PATH['project'] . '/media' . '/entries/' . $id)) {
@@ -897,15 +915,10 @@ public function editProcess(Request $request, Response $response) : Response
897915

898916
$data['published_by'] = flextype('acl')->getUserLoggedInUuid();
899917

900-
//$entry2 = flextype('entries')->fetch($id)->toArray();
901-
902918
$entry = flextype('serializers')
903919
->frontmatter()
904920
->decode(filesystem()->file(flextype('entries')->getFileLocation($id))->get());
905921

906-
//dump($entry2);
907-
//dd($entry);
908-
909922
Arrays::delete($entry, 'slug');
910923
Arrays::delete($entry, 'id');
911924
Arrays::delete($entry, 'modified_at');
@@ -978,7 +991,11 @@ public function uploadMediaFileProcess(Request $request, Response $response) : R
978991
{
979992
$data = $request->getParsedBody();
980993

981-
if (flextype('media')->files()->upload($_FILES['file'], '/entries/' . $data['entry-id'] . '/')) {
994+
if (! flextype('media')->folders()->has('entries/' . $data['entry-id'])) {
995+
flextype('media')->folders()->create('entries/' . $data['entry-id']);
996+
}
997+
998+
if (flextype('media')->files()->upload($_FILES['file'], 'entries/' . $data['entry-id'] . '/')) {
982999
flextype('flash')->addMessage('success', __('admin_message_entry_file_uploaded'));
9831000
} else {
9841001
flextype('flash')->addMessage('error', __('admin_message_entry_file_not_uploaded'));

0 commit comments

Comments
 (0)