Merge pull request #226 from helsingborg-stad/revert-225-feature/requ…

…ire-image Fix: revert "Feature/require image"
helsingborg-stad · Oct 5, 2023 · b505d84 · b505d84
2 parents b273232 + 2373e9e
commit b505d84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/source/js/front/form-submit.js b/source/js/front/form-submit.js
@@ -22,7 +22,11 @@ const eventFormSubmit = {
                 imageData.append('file', imageInput.files[0]);
 
                 const formRequests = [];
-                formRequests.push(eventFormSubmit.submitImageData(imageData));
+                if (imageInput.files[0]) {
+                    formRequests.push(eventFormSubmit.submitImageData(imageData));
+                } else {
+                    formRequests.push(null);
+                }
 
                 const formUserGroups = formData.user_groups.join(',');
 
@@ -83,7 +87,7 @@ const eventFormSubmit = {
                             formData['location'] = locationResponse.data.id;
                         }
 
-                        const errorResponses = [imageResponse, organizerResponse, locationResponse].filter(x => !Array.isArray(x) && !x.success).map(x => x.data);
+                        const errorResponses = [organizerResponse, locationResponse].filter(x => !Array.isArray(x) && !x.success).map(x => x.data);
                         if (!errorResponses.length > 0) {
                             eventFormSubmit.submitFormData(formData, 'submit_event').then(response => {
                                 if (response.success) {

diff --git a/source/php/Module/EventForm/Fields.php b/source/php/Module/EventForm/Fields.php
@@ -52,7 +52,7 @@ public static function get(?int $id = 0)
                             ) . '<br>' .
                             __('You must also have the right to use and distribute the image.', 'event-integration'),
                         'type' => 'image',
-                        'required' => true,
+                        'required' => !empty($data['image_input']['required']),
                         'aspectRatio' => '16:9'
                     ],
                     [