Merge pull request #384 from jonasdekeukelaere/521-user-template-images

Fix delete user template directory
sumocoders · Oct 11, 2024 · a2c2a0a · a2c2a0a
2 parents 3405a9f + a4c1cc0
commit a2c2a0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Backend/Modules/Pages/Ajax/RemoveUploadedFile.php b/src/Backend/Modules/Pages/Ajax/RemoveUploadedFile.php
@@ -25,6 +25,12 @@ public function execute(): void
 
         $path = FRONTEND_FILES_PATH . '/Pages/' . $directory . '/' . $file;
 
+        if (!is_file($path)) {
+            $this->output(Response::HTTP_OK);
+
+            return;
+        }
+
         $filesystem = new Filesystem();
         if ($filesystem->exists($path)) {
             $filesystem->remove($path);

diff --git a/src/Backend/Modules/Pages/Js/Pages.js b/src/Backend/Modules/Pages/Js/Pages.js
@@ -970,7 +970,7 @@ jsBackend.pages.extras = {
           )
 
           // send a request to remove the old image if the old image doesn't have the same name
-          if (oldImage !== response.data) {
+          if (oldImage && oldImage !== response.data) {
             $.ajax({
               data: {
                 fork: {module: 'Pages', action: 'RemoveUploadedFile'},
@@ -1022,7 +1022,7 @@ jsBackend.pages.extras = {
           )
 
           // send a request to remove the old image if the old image doesn't have the same name
-          if (oldImage !== response.data) {
+          if (oldImage && oldImage !== response.data) {
             $.ajax({
               data: {
                 fork: {module: 'Pages', action: 'RemoveUploadedFile'},