Merge pull request #1282 from Itemshopp/patch-1

Correction of issue in EmbedImage and FeaturedImage when path is empty
austintoddj · Jun 21, 2023 · d5a3614 · d5a3614
2 parents 34a129e + 32d4b8e
commit d5a3614
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/resources/js/components/editor/EmbedImageModal.vue b/resources/js/components/editor/EmbedImageModal.vue
@@ -233,7 +233,7 @@ export default {
 
         getServerOptions() {
             return {
-                url: `${this.settings.path}/api/uploads`,
+                url: this.settings.path !== '/' ? `${this.settings.path}/api/uploads` : '/api/uploads',
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },

diff --git a/resources/js/components/modals/AvatarModal.vue b/resources/js/components/modals/AvatarModal.vue
@@ -106,9 +106,9 @@ export default {
         }),
 
         getServerOptions() {
+
             return {
-                // TODO: This check shouldn't need to be here
-                url: this.settings.path === '/' ? `/api/uploads` : `${this.settings.path}/api/uploads`,
+                url: this.settings.path !== '/' ? `${this.settings.path}/api/uploads` : '/api/uploads',
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },

diff --git a/resources/js/components/modals/FeaturedImageModal.vue b/resources/js/components/modals/FeaturedImageModal.vue
@@ -227,7 +227,7 @@ export default {
 
         getServerOptions() {
             return {
-                url: `${this.settings.path}/api/uploads`,
+                url: this.settings.path !== '/' ? `${this.settings.path}/api/uploads` : '/api/uploads',
                 headers: {
                     'X-CSRF-TOKEN': document.head.querySelector('meta[name="csrf-token"]').content,
                 },