From 969ba3db2a388b24bbfd4672cf2f1a3f5c3dbf28 Mon Sep 17 00:00:00 2001 From: Carsten Rose <carsten.rose@math.uzh.ch> Date: Thu, 16 Mar 2017 09:18:57 +0100 Subject: [PATCH] AbstractBuildForm.php: removed not so usefull error check. --- extension/Documentation/Manual.rst | 20 ++++++++++++++++++-- extension/qfq/qfq/AbstractBuildForm.php | 3 --- extension/qfq/qfq/Constants.php | 2 +- extension/qfq/qfq/QuickFormQuery.php | 3 +++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/extension/Documentation/Manual.rst b/extension/Documentation/Manual.rst index baaf3b8e4..8831b008b 100644 --- a/extension/Documentation/Manual.rst +++ b/extension/Documentation/Manual.rst @@ -1306,13 +1306,13 @@ Checkboxes can be rendered in mode: * Each field key (or the corresponding value from the key/value pair) will be rendered right beside the checkbox. * *FormElement.parameter* - * *checkBoxMode*: multi + * *checkBoxMode* = multi * *itemList* - E.g.: * ``itemList=red,blue,orange`` * ``itemList=1:red,2:blue,3:orange`` - * ``itemList={{!SELECT id, value FROM someTable}}`` + * *FormElement.sql1* = ``{{!SELECT id, value FROM someTable}}`` * *FormElement.maxlength* - vertical or horizontal alignment: * Value: '', 0, 1 - The check boxes will be aligned vertical. @@ -3802,6 +3802,22 @@ Same as above, but written in the nested notation :: Release ======= +Version 0.future +---------------- + +Changes +^^^^^^^ + + * Play formEditor.sql. + + * Dropdownlist of containerassigment updated. + +Features +^^^^^^^^ + +Bug Fixes +^^^^^^^^^ + Version 0.13 ------------ diff --git a/extension/qfq/qfq/AbstractBuildForm.php b/extension/qfq/qfq/AbstractBuildForm.php index 3ff0441c8..849b0f73f 100644 --- a/extension/qfq/qfq/AbstractBuildForm.php +++ b/extension/qfq/qfq/AbstractBuildForm.php @@ -1136,9 +1136,6 @@ abstract class AbstractBuildForm { $itemKey = array(); $itemValue = array(); - if (count($formElement) < 20) - throw new CodeException("Invalid (none or to small) Formelement", ERROR_MISSING_FORMELEMENT); - // Call getItemsForEnumOrSet() only if there a corresponding column really exist. if (false !== $this->store->getVar($formElement['name'], STORE_TABLE_COLUMN_TYPES)) { $itemValue = $this->getItemsForEnumOrSet($formElement['name'], $fieldType); diff --git a/extension/qfq/qfq/Constants.php b/extension/qfq/qfq/Constants.php index cb94a561a..0fba784aa 100644 --- a/extension/qfq/qfq/Constants.php +++ b/extension/qfq/qfq/Constants.php @@ -134,7 +134,7 @@ const ERROR_LOG_NOT_WRITABLE = 1045; const ERROR_UNNOWN_STORE = 1046; const ERROR_GET_STORE_ZERO = 1047; const ERROR_SET_STORE_ZERO = 1048; -const ERROR_MISSING_FORMELEMENT = 1049; + const ERROR_INVALID_OR_MISSING_PARAMETER = 1050; const ERROR_UNKNOWN_SQL_LOG_MODE = 1051; const ERROR_FORM_NOT_FOUND = 1052; diff --git a/extension/qfq/qfq/QuickFormQuery.php b/extension/qfq/qfq/QuickFormQuery.php index 92d406d7b..5304b24eb 100644 --- a/extension/qfq/qfq/QuickFormQuery.php +++ b/extension/qfq/qfq/QuickFormQuery.php @@ -286,6 +286,7 @@ class QuickFormQuery { case FORM_UPDATE: $formAction->elements($recordId, $this->feSpecAction, FE_TYPE_BEFORE_LOAD); + // data['form-update']=.... $data = $build->process($formMode); $formAction->elements($recordId, $this->feSpecAction, FE_TYPE_AFTER_LOAD); break; @@ -336,6 +337,7 @@ class QuickFormQuery { $formAction->elements($rc, $this->feSpecAction, FE_TYPE_SENDMAIL); // Retrieve FE Values as JSON + // $data['form-update']=... $data = $build->process($formMode, $htmlElementNameIdZero); break; @@ -344,6 +346,7 @@ class QuickFormQuery { } if (is_array($data)) { + // $data['element-update']=... $data = $this->groupElementUpdateEntries($data); } return $data; -- GitLab