Skip to content
Snippets Groups Projects
Commit fb907848 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Fixes #7702: Form/FE: Unnecessary evaluation of column 'noteInternal' / 'adminNote'

parent c82de330
No related branches found
No related tags found
No related merge requests found
Pipeline #1379 passed
...@@ -853,6 +853,7 @@ const F_REQUIRED_PARAMETER_EDIT = 'requiredParameterEdit'; ...@@ -853,6 +853,7 @@ const F_REQUIRED_PARAMETER_EDIT = 'requiredParameterEdit';
const F_EXTRA_DELETE_FORM = 'extraDeleteForm'; const F_EXTRA_DELETE_FORM = 'extraDeleteForm';
const F_FINAL_DELETE_FORM = 'finalDeleteForm'; const F_FINAL_DELETE_FORM = 'finalDeleteForm';
const F_DIRTY_MODE = 'dirtyMode'; const F_DIRTY_MODE = 'dirtyMode';
const F_NOTE_INTERNAL = 'noteInternal';
const F_SUBMIT_BUTTON_TEXT = 'submitButtonText'; const F_SUBMIT_BUTTON_TEXT = 'submitButtonText';
const F_BUTTON_ON_CHANGE_CLASS = 'buttonOnChangeClass'; const F_BUTTON_ON_CHANGE_CLASS = 'buttonOnChangeClass';
...@@ -994,6 +995,7 @@ const FE_SUBRECORD_OPTION = 'subrecordOption'; ...@@ -994,6 +995,7 @@ const FE_SUBRECORD_OPTION = 'subrecordOption';
const FE_SQL1 = 'sql1'; const FE_SQL1 = 'sql1';
const FE_PLACEHOLDER = 'placeholder'; const FE_PLACEHOLDER = 'placeholder';
const FE_DATA_REFERENCE = 'dataReference'; const FE_DATA_REFERENCE = 'dataReference';
const FE_ADMIN_NOTE = 'adminNote';
// FormElement columns: via parameter field // FormElement columns: via parameter field
const FE_DATE_FORMAT = 'dateFormat'; // value: FORMAT_DATE_INTERNATIONAL | FORMAT_DATE_GERMAN const FE_DATE_FORMAT = 'dateFormat'; // value: FORMAT_DATE_INTERNATIONAL | FORMAT_DATE_GERMAN
......
...@@ -1159,6 +1159,8 @@ class QuickFormQuery { ...@@ -1159,6 +1159,8 @@ class QuickFormQuery {
break; break;
} }
unset($form[F_NOTE_INTERNAL]);
if (isset($form[F_ESCAPE_TYPE_DEFAULT]) && $form[F_ESCAPE_TYPE_DEFAULT] == TOKEN_ESCAPE_CONFIG) { if (isset($form[F_ESCAPE_TYPE_DEFAULT]) && $form[F_ESCAPE_TYPE_DEFAULT] == TOKEN_ESCAPE_CONFIG) {
$form[F_ESCAPE_TYPE_DEFAULT] = $this->store->getVar(SYSTEM_ESCAPE_TYPE_DEFAULT, STORE_SYSTEM); $form[F_ESCAPE_TYPE_DEFAULT] = $this->store->getVar(SYSTEM_ESCAPE_TYPE_DEFAULT, STORE_SYSTEM);
} }
......
...@@ -51,7 +51,9 @@ class HelperFormElement { ...@@ -51,7 +51,9 @@ class HelperFormElement {
public static function formElementSetDefault(array $elements) { public static function formElementSetDefault(array $elements) {
foreach ($elements AS $key => $element) { foreach ($elements AS $key => $element) {
$elements[$key][FE_TG_INDEX] = 0; $elements[$key][FE_TG_INDEX] = 0;
unset($elements[$key][FE_ADMIN_NOTE]);
// $elements[$key][FE_DATA_REFERENCE] = ''; // $elements[$key][FE_DATA_REFERENCE] = '';
} }
return $elements; return $elements;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment