Merge branch 'B18668_filepond_file_download_impossible_with_formModeGlobal_readonly' into 'develop'

filepond download for formModeGlobal=readonly, visual modifications

See merge request !737

extension/Classes/Core/AbstractBuildForm.php

@@ -4341,7 +4341,7 @@ abstract class AbstractBuildForm {
         $attribute .= Support::doAttribute('data-load', ($formElement[FE_DYNAMIC_UPDATE] === 'yes') ? 'data-load' : '');
         $attribute .= Support::doAttribute('class', [$formElement[F_FE_FIELDSET_CLASS], ($formElement[FE_MODE] == FE_MODE_HIDDEN) ? FE_MODE_HIDDEN : '']);
         $attribute .= Support::doAttribute(ATTRIBUTE_DATA_REFERENCE, $formElement[FE_DATA_REFERENCE]);
-        $attribute .= HelperFormElement::getAttributeFeMode($formElement[FE_MODE], false);
+        $attribute .= HelperFormElement::getAttributeFeMode($formElement[FE_MODE], false, $formElement[FE_TYPE]);
 
         // <fieldset>
         $html = '<fieldset ' . $attribute . '>';

extension/Classes/Core/Helper/HelperFormElement.php

@@ -719,13 +719,13 @@ EOF;
      * Set corresponding html attributes readonly/required/disabled, based on $formElement[FE_MODE].
      *
      * @param string $feMode
-     *
      * @param bool $cssDisable
+     * @param string $feType
      * @return string
      * @throws \CodeException
      * @throws \UserFormException
      */
-    public static function getAttributeFeMode($feMode, $cssDisable = true) {
+    public static function getAttributeFeMode($feMode, $cssDisable = true, $feType = null) {
         $attribute = '';
 
         self::getFeMode($feMode, $hidden, $disabled, $required);
@@ -739,7 +739,10 @@ EOF;
                 $attribute .= Support::doAttribute('required', 'required');
                 break;
             case FE_MODE_READONLY:
-                $attribute .= Support::doAttribute('disabled', 'disabled');
+
+                // #18668: <button> inside disabled <fieldset> (or other element) does not register click events
+                $attr = ($feType === FE_TYPE_FIELDSET) ? 'readonly' : 'disabled';
+                $attribute .= Support::doAttribute($attr, $attr);
                 break;
             default:
                 throw new \UserFormException("Unknown mode '$feMode'", ERROR_UNKNOWN_MODE);

javascript/src/Helper/filePond.js

@@ -30,8 +30,12 @@ QfqNS.Helper = QfqNS.Helper || {};
             const formId = this.inputElement.closest('form.qfq-form').id;
             const saveButtonId = 'save-button-' + formId;
             this.saveButton = document.querySelector('#' + saveButtonId);
-            this.saveButtonIcon = this.saveButton.querySelector('span');
-            this.saveButtonLabel = this.saveButton.innerText;
+
+            // No save button for formModeGlobal=readonly
+            if(this.saveButton) {
+                this.saveButtonIcon = this.saveButton.querySelector('span');
+                this.saveButtonLabel = this.saveButton.innerText;
+            }
         }
 
         const apiUrls = inputElement.getAttribute('data-api-urls');

less/qfq-bs.css.less

@@ -1725,7 +1725,8 @@ input.qfq-password {
 
 .filepond--file-action-button {
   top: 6px;
-  font-size: 14px !important;;
+  font-size: 14px !important;
+  cursor: pointer !important;
 }
 
 .filepond--action-download-item > span {