diff --git a/.gitignore b/.gitignore
index 6338e21bbb02e9e212f2cdd49c267722da89c4c4..8b093469de16a3ff5b64c9f6ea98afcbe51247e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
.webprj
.vscode
.run
+.phpunit.result.cache
nbprojec
nohup.out
diff --git a/Documentation/Form.rst b/Documentation/Form.rst
index 908f51a119efd8528ac7ce92252c6d9584067765..54251ef685c7ad014eb74a83e2e8c3ba18865c30 100644
--- a/Documentation/Form.rst
+++ b/Documentation/Form.rst
@@ -923,11 +923,6 @@ Fields:
+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
|Parameter | text | Might contain misc parameter. See :ref:`fe-parameter-attributes` |
+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
-|feGroup | string | Comma-separated list of Typo3 FE Group ID. NOT SURE IF THIS WILL BE IMPLEMENTED. Native |
-| | | *FormElements*, fieldsets and pills can be assigned to feGroups. Group status: show, hidden, |
-| | | hidden. Group Access: FE-Groups. User will be assigned to FE-Groups and the form definition |
-| | | reference such FE-groups. Easy way of granting permission. |
-+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
|Deleted | string | 'yes'|'no'. |
+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
@@ -1892,7 +1887,7 @@ will be rendered inside the form as a HTML table.
* *nostrip*: by default, html tags will be stripped off the cell content before rendering. This protects the table
layout. 'nostrip' deactivates the cleaning to make pure html possible.
* *icon*: the cell value contains the name of an icon in *typo3conf/ext/qfq/Resources/Public/icons*. Empty cell values
- will omit an html image tag (=nothing rendered in the cell).
+ will omit an html image tag (=nothing rendered in the cell). See :ref:`qfq-icons`.
* *link*: value will be rendered as described under :ref:`column-link`
* *url*: value will be rendered as a href url.
* *mailto*: value will be rendered as a href mailto.
@@ -2878,7 +2873,7 @@ The following fields are possible:
* Form: *title, showButton, forwardMode, forwardPage, bsLabelColumns, bsInputColumns, bsNoteColumns, recordLockTimeoutSeconds*
* FormElement: *label, mode, modeSql, class, type, subrecordOption, encode, checkType, ord, size, maxLength,*
- *bsLabelColumns, bsInputColumns, bsNoteColumns,rowLabelInputNote, note, tooltip, placeholder, value, sql1, feGroup*
+ *bsLabelColumns, bsInputColumns, bsNoteColumns,rowLabelInputNote, note, tooltip, placeholder, value, sql1*
.. _dynamic-update:
diff --git a/Documentation/UseCase.rst b/Documentation/UseCase.rst
index a8a0fa3da5fb65b46d19fd67099be2db55992d18..2c67317b419a9f6be00b5feb2a1c70300e5fd258 100644
--- a/Documentation/UseCase.rst
+++ b/Documentation/UseCase.rst
@@ -90,13 +90,16 @@ Table: Person
`firstName` varchar(64) NOT NULL DEFAULT '',
`email` varchar(128) NOT NULL,
`account` varchar(128) NOT NULL,
- `auth` varchar(32) NOT NULL,
+ `auth` varchar(32) NOT NULL DEFAULT '',
`authExpire` datetime DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1;
ALTER TABLE `Person` ADD PRIMARY KEY (`id`);
ALTER TABLE `Person` MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT;
+or::
+
+ ALTER TABLE `Person` ADD `auth` VARCHAR(32) NOT NULL DEFAULT '' AFTER `account`, ADD `authExpire` DATETIME DEFAULT NULL AFTER `auth`;
Registration
^^^^^^^^^^^^
@@ -116,7 +119,7 @@ QFQ content record::
form={{SELECT IF('{{action:SE}}' = '','registration','') }}
20.sql = SELECT "<p>Thank you for your registration.</p><p>An email with further instructions has been sent to you.</p>"
- , "<p>You should receive the mail during the next 5 minutes. If not, please check your SPAM folder.</p>"
+ , "<p>You should receive the mail during the next 5 minutes. If not, please check your JUNK folder.</p>"
FROM (SELECT '') AS fake
WHERE '{{action:SE}}' = 'thanksRegistration'
@@ -125,6 +128,12 @@ QFQ content record::
Form: registration
""""""""""""""""""
+
+.. note::
+
+ Take care that the QFQ STORE_SYTEM variable `ADMINISTRATIVE_EMAIL` is set.
+
+JSON Form
::
{
@@ -168,7 +177,7 @@ Form: registration
"modeSql": "",
"class": "action",
"type": "beforeSave",
- "parameter": "sqlValidate={{!SELECT p.id FROM Person AS p WHERE p.email='{{email:F:alnumx}}' OR ('{{firstName:F:allbut}}'=p.firstName AND '{{lastName:F:allbut}}'=p.lastName ) LIMIT 1 }}\r\n expectRecords=0\r\nmessageFail=Sorry, person already registered by name or email. Please just reset the password under <a href='?id=reset'>reset</a>"
+ "parameter": "sqlValidate={{!SELECT p.id FROM Person AS p WHERE p.email='{{email:F:alnumx}}' OR ('{{firstName:F:allbut}}'=p.firstName AND '{{lastName:F:allbut}}'=p.lastName ) LIMIT 1 }}\r\nexpectRecords=0\r\nmessageFail=Sorry, person already registered by name or email (in case of a namesake please contact <a href="mailto:{{ADMINISTRATIVE_EMAIL:Y}}">{{ADMINISTRATIVE_EMAIL:Y}}</a>). Please just reset the password under <a href='?id=reset'>reset</a>"
},
{
"enabled": "yes",
@@ -213,7 +222,7 @@ QFQ content record::
head = <div class="alert alert-success">
<p>Thank you.</p>
<p>If the email address is known in our database, we sent a password reset link to it.</p>
- <p>The mail should be received during the next minutes. If not, please check you junk folder.</p>
+ <p>The mail should be received during the next minutes. If not, please check you JUNK folder.</p>
<p>To set a new password, please click on the link provided in the email.</p>
</div>
}
@@ -223,7 +232,9 @@ Form: passwordReset
.. note::
- Take care that there is one dummy person record with person.id=1
+ * Take care that there is one dummy person record with person.id=1.
+ * Update 'example.com' references.
+ * Update sendMailGrId=123, sendMailXId=456
Form 'passwordReset'::
@@ -272,8 +283,8 @@ Form 'passwordReset'::
"encode": "specialchar",
"checkType": "auto",
"ord": 50,
- "value": "Dear new user\r\nPlease set a new password under {{baseUrl:Y}}?id=set&auth={{auth:V}}\r\nRegards.",
- "parameter": "fillStoreVar={{!SELECT CONCAT(p.firstName , ' ', p.lastName) AS name, p.id AS _pId, @expire:=DATE_ADD(NOW(), INTERVAL 4 DAY) AS expireTs, QDATE_FORMAT(@expire) AS expire, p.email, '{{random:V}}' AS auth FROM Person AS p WHERE p.email='{{emailValue:F:alnumx}}' AND p.email!='' LIMIT 1}}\r\n\r\nsendMailTo={{email:VE}}\r\nsendMailSubject=Password Reset\r\nsendMailFrom=webmaster@example.com\r\nsendMailGrId=123\r\nsendMailXId=456\r\n\r\n# Set token & expiration\r\nsqlAfter = {{UPDATE Person SET auth='{{auth:V}}', authExpire='{{expireTs:V}}' WHERE email='{{emailValue:F:alnumx}}' AND email!='' LIMIT 1}}"
+ "value": "Dear user\r\nPlease set a new password under {{baseUrl:Y}}?id=set&auth={{auth:V}}\r\nRegards.",
+ "parameter": "fillStoreVar={{!SELECT CONCAT(p.firstName , ' ', p.lastName) AS name, p.id AS _pId, @expire:=DATE_ADD(NOW(), INTERVAL 4 DAY) AS expireTs, QDATE_FORMAT(@expire) AS expire, p.email, '{{random:V}}' AS auth FROM Person AS p WHERE p.email='{{emailValue:F:alnumx}}' AND p.email!='' LIMIT 1}}\r\n\r\nsendMailTo={{email:VE}}\r\nsendMailSubject=Password Reset\r\nsendMailFrom={{ADMINISTRATIVE_EMAIL:Y}}\r\nsendMailGrId=123\r\nsendMailXId=456\r\n\r\n# Set token & expiration\r\nsqlAfter = {{UPDATE Person SET auth='{{auth:V}}', authExpire='{{expireTs:V}}' WHERE email='{{emailValue:F:alnumx}}' AND email!='' LIMIT 1}}"
}
]
}
@@ -313,7 +324,7 @@ QFQ content record::
, 'Token invalid'
, IF( NOW()<p.authExpire
,''
- , IF( p.authExpire=0, 'Password already set', 'Token expired') )
+ , IF( p.authExpire=0 OR ISNULL(p.authExpire), 'Password already set', 'Token expired') )
)
FROM (SELECT '') AS fake
LEFT JOIN Person AS p
diff --git a/docker/db_fixture_qfq.sql b/docker/db_fixture_qfq.sql
index 5537a1de5a35e167cd1530b3e5bfc55198ae6e97..20a24b48134a082feed6912aa09b155175766d77 100644
--- a/docker/db_fixture_qfq.sql
+++ b/docker/db_fixture_qfq.sql
@@ -222,53 +222,51 @@ DROP TABLE IF EXISTS `FormElement`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `FormElement` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `formId` int(11) NOT NULL,
- `feIdContainer` int(11) NOT NULL DEFAULT 0,
- `dynamicUpdate` enum('yes','no') NOT NULL DEFAULT 'no',
- `enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
- `name` varchar(255) NOT NULL DEFAULT '',
- `label` varchar(1023) NOT NULL DEFAULT '',
- `mode` enum('show','required','readonly','hidden') NOT NULL DEFAULT 'show',
- `modeSql` text NOT NULL,
- `class` enum('native','action','container') NOT NULL DEFAULT 'native',
- `type` enum('checkbox','date','datetime','dateJQW','datetimeJQW','extra','gridJQW','text','editor','annotate','time','note','password','radio','select','subrecord','upload','annotate','imageCut','fieldset','pill','templateGroup','beforeLoad','beforeSave','beforeInsert','beforeUpdate','beforeDelete','afterLoad','afterSave','afterInsert','afterUpdate','afterDelete','sendMail','paste') NOT NULL DEFAULT 'text',
- `subrecordOption` set('edit','delete','new') NOT NULL DEFAULT '',
- `encode` enum('none','specialchar') NOT NULL DEFAULT 'specialchar',
- `checkType` enum('auto','alnumx','digit','numerical','email','pattern','allbut','all') NOT NULL DEFAULT 'auto',
- `checkPattern` varchar(255) NOT NULL DEFAULT '',
- `onChange` varchar(255) NOT NULL DEFAULT '',
- `ord` int(11) NOT NULL DEFAULT 0,
- `tabindex` int(11) NOT NULL DEFAULT 0,
- `size` varchar(255) NOT NULL DEFAULT '',
- `maxLength` varchar(255) NOT NULL DEFAULT '',
- `labelAlign` enum('default','left','center','right') NOT NULL DEFAULT 'default',
- `bsLabelColumns` varchar(255) NOT NULL DEFAULT '',
- `bsInputColumns` varchar(255) NOT NULL DEFAULT '',
- `bsNoteColumns` varchar(255) NOT NULL DEFAULT '',
- `rowLabelInputNote` set('row','label','/label','input','/input','note','/note','/row') NOT NULL DEFAULT 'row,label,/label,input,/input,note,/note,/row',
- `note` text NOT NULL,
- `adminNote` text NOT NULL,
- `tooltip` varchar(255) NOT NULL DEFAULT '',
- `placeholder` varchar(2048) NOT NULL DEFAULT '',
- `value` text NOT NULL,
- `sql1` text NOT NULL,
- `parameter` text NOT NULL,
- `parameterLanguageA` text NOT NULL,
- `parameterLanguageB` text NOT NULL,
- `parameterLanguageC` text NOT NULL,
- `parameterLanguageD` text NOT NULL,
- `clientJs` text NOT NULL,
- `feGroup` varchar(255) NOT NULL DEFAULT '',
- `deleted` enum('yes','no') NOT NULL DEFAULT 'no',
- `modified` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
- `created` datetime NOT NULL DEFAULT current_timestamp(),
- PRIMARY KEY (`id`),
- KEY `formId` (`formId`),
- KEY `formId_class_enabled_deleted` (`formId`,`class`,`enabled`,`deleted`),
- KEY `feIdContainer` (`feIdContainer`),
- KEY `ord` (`ord`),
- KEY `feGroup` (`feGroup`)
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `formId` int(11) NOT NULL,
+ `feIdContainer` int(11) NOT NULL DEFAULT 0,
+ `dynamicUpdate` enum('yes','no') NOT NULL DEFAULT 'no',
+ `enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
+ `name` varchar(255) NOT NULL DEFAULT '',
+ `label` varchar(1023) NOT NULL DEFAULT '',
+ `mode` enum('show','required','readonly','hidden') NOT NULL DEFAULT 'show',
+ `modeSql` text NOT NULL,
+ `class` enum('native','action','container') NOT NULL DEFAULT 'native',
+ `type` enum('checkbox','date','datetime','dateJQW','datetimeJQW','extra','gridJQW','text','editor','annotate','time','note','password','radio','select','subrecord','upload','annotate','imageCut','fieldset','pill','templateGroup','beforeLoad','beforeSave','beforeInsert','beforeUpdate','beforeDelete','afterLoad','afterSave','afterInsert','afterUpdate','afterDelete','sendMail','paste') NOT NULL DEFAULT 'text',
+ `subrecordOption` set('edit','delete','new') NOT NULL DEFAULT '',
+ `encode` enum('none','specialchar') NOT NULL DEFAULT 'specialchar',
+ `checkType` enum('auto','alnumx','digit','numerical','email','pattern','allbut','all') NOT NULL DEFAULT 'auto',
+ `checkPattern` varchar(255) NOT NULL DEFAULT '',
+ `onChange` varchar(255) NOT NULL DEFAULT '',
+ `ord` int(11) NOT NULL DEFAULT 0,
+ `tabindex` int(11) NOT NULL DEFAULT 0,
+ `size` varchar(255) NOT NULL DEFAULT '',
+ `maxLength` varchar(255) NOT NULL DEFAULT '',
+ `labelAlign` enum('default','left','center','right') NOT NULL DEFAULT 'default',
+ `bsLabelColumns` varchar(255) NOT NULL DEFAULT '',
+ `bsInputColumns` varchar(255) NOT NULL DEFAULT '',
+ `bsNoteColumns` varchar(255) NOT NULL DEFAULT '',
+ `rowLabelInputNote` set('row','label','/label','input','/input','note','/note','/row') NOT NULL DEFAULT 'row,label,/label,input,/input,note,/note,/row',
+ `note` text NOT NULL,
+ `adminNote` text NOT NULL,
+ `tooltip` varchar(255) NOT NULL DEFAULT '',
+ `placeholder` varchar(2048) NOT NULL DEFAULT '',
+ `value` text NOT NULL,
+ `sql1` text NOT NULL,
+ `parameter` text NOT NULL,
+ `parameterLanguageA` text NOT NULL,
+ `parameterLanguageB` text NOT NULL,
+ `parameterLanguageC` text NOT NULL,
+ `parameterLanguageD` text NOT NULL,
+ `clientJs` text NOT NULL,
+ `deleted` enum('yes','no') NOT NULL DEFAULT 'no',
+ `modified` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+ `created` datetime NOT NULL DEFAULT current_timestamp(),
+ PRIMARY KEY (`id`),
+ KEY `formId` (`formId`),
+ KEY `formId_class_enabled_deleted` (`formId`,`class`,`enabled`,`deleted`),
+ KEY `feIdContainer` (`feIdContainer`),
+ KEY `ord` (`ord`)
) ENGINE=InnoDB AUTO_INCREMENT=765 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/extension/Classes/Core/Database/DatabaseUpdate.php b/extension/Classes/Core/Database/DatabaseUpdate.php
index 6abca4696f8edeb7b4a3b654f0c459ad1bbbed9d..dba7a43fe5c57a1ea60a31f89f2e999f5bbf598a 100644
--- a/extension/Classes/Core/Database/DatabaseUpdate.php
+++ b/extension/Classes/Core/Database/DatabaseUpdate.php
@@ -498,11 +498,15 @@ class DatabaseUpdate {
$KEY_SQL_UPDATE = 'sql_update'; // sql update statement for that blob
// get reports from tt_content.bodytext
- $reports = $this->db->sql("SELECT tt.`uid`, tt.`header`, tt.`bodytext`, tt.`hidden`, p.`hidden` AS pageHidden FROM `" . $dbT3 . "`.`tt_content` AS tt, `" . $dbT3 . "`.`pages` AS p WHERE tt.`CType`='qfq_qfq' AND tt.`deleted`=0 AND p.`deleted`=0 AND p.uid=tt.pid");
+ $reports = $this->db->sql("SELECT tt.`uid`, tt.`header`, tt.`bodytext`, tt.`hidden`, p.`hidden` AS pageHidden,"
+ . " p.`title` AS pageTitle, p.`uid` AS pageId FROM `"
+ . $dbT3 . "`.`tt_content` AS tt, `" . $dbT3
+ . "`.`pages` AS p WHERE tt.`CType`='qfq_qfq' AND tt.`deleted`=0 AND p.`deleted`=0 AND p.uid=tt.pid ORDER BY p.uid, tt.sorting");
$qfqCodeBlobs = array_map(function ($r) use ($dbT3, $KEY_SQL_UPDATE, $KEY_CONTENT, $KEY_TITLE) {
$maybeHidden = (intval($r['hidden']) !== 0) || (intval($r['pageHidden']) !== 0);
return [
- $KEY_TITLE => 'QFQ Report with uid=' . $r['uid'] . ' and header: ' . $r['header']
+ $KEY_TITLE => 'QFQ Report with uid <u>' . $r['uid'] . '</u> and header <u>' . $r['header']
+ . '</u> on page <u>' . $r['pageId'] . '/' . $r['pageTitle'] . '</u>'
. ($maybeHidden ? '<br><small>Note: Content element is probably hidden / not in use.</small>' : ''),
$KEY_CONTENT => $r['bodytext'],
$KEY_SQL_UPDATE => "UPDATE `$dbT3`.`tt_content` SET `bodytext` = ? WHERE uid=" . $r['uid'] . ";"
@@ -551,8 +555,7 @@ class DatabaseUpdate {
'parameterLanguageB',
'parameterLanguageC',
'parameterLanguageD',
- 'clientJs',
- 'feGroup'
+ 'clientJs'
];
$formElements = $this->db->sql("SELECT `fe`.`id`, `fe`.`" . join("`, `fe`.`", $formElementColumnsToCheck) . "` FROM `FormElement` AS fe");
foreach ($formElements as $i => $formElement) {
@@ -699,7 +702,7 @@ class DatabaseUpdate {
. '<li>Use {{pageSlug:T}} instead of {{pageAlias:T}} or {{pageId:T}} in the _link columns. E.g. "p:{{pageSlug}}?foo=bar" AS link .</li>'
. '<li>Use {{baseUrlLang:Y}}/{{pageSlug:T}} instead of {{pageAlias:T}} or {{pageId:T}} in hardcoded ' . htmlentities("<a>") . ' tags. E.g. href="{{baseUrlLang:Y}}/{{pageSlug:T}}?foo=bar".</li>'
. '<li>Replace hardcoded aliases in QFQ code with the slugs of the pages. E.g. "p:/some/page?foo=bar" AS _link.</li>'
- . '<li>Replace "U: ... &id=[alias]& ... " with "p:[slug]? ... " for all sepecial columns except _paged. I.e. "U: ... &id=[alias]& ... " becomes "p:[slug]? ... ". </li>'
+ . '<li>Replace "U: ... &id=[alias]& ... " with "p:[slug]? ... " for all special columns except _paged. I.e. "U: ... &id=[alias]& ... " becomes "p:[slug]? ... ". </li>'
. '<li>Hint: Typo3 replaces "_" with "-" when converting an alias to a slug during the Typo3 version 9 upgrade.</li>'
. '<li>Hint: A page slug always starts with a slash "/" and QFQ expects the slash to be there.</li>'
. '<li>Note: After the page slug comes a "?" not a "&". E.g. "p:/some/page?foo=bar" AS _link. </li>'
@@ -707,7 +710,7 @@ class DatabaseUpdate {
. '<h2>AUTO SUGGESTIONS</h2>'
- . 'In the report below the suggested changes are prominently marked with colour.'
+ . 'In the report below the suggested changes are prominently marked with color.'
. "<br> If there is a $noSuggestionSymbol then there is no suggestion and you will have to fix it manually."
. "<br> Tip: use ctrl+f and copy $noSuggestionSymbol into the search bar to quickly jump between matches."
diff --git a/extension/Classes/Core/Database/DatabaseUpdateData.php b/extension/Classes/Core/Database/DatabaseUpdateData.php
index 8704cd78808e978000d1b87aa92c82e0209885e2..47e0335de04d498210022606ce025fea6e3f147b 100644
--- a/extension/Classes/Core/Database/DatabaseUpdateData.php
+++ b/extension/Classes/Core/Database/DatabaseUpdateData.php
@@ -30,7 +30,6 @@ $UPDATE_ARRAY = array(
'0.16.0' => [
"ALTER TABLE `FormElement` ADD INDEX `feIdContainer` (`feIdContainer`)",
"ALTER TABLE `FormElement` ADD INDEX `ord` (`ord`)",
- "ALTER TABLE `FormElement` ADD INDEX `feGroup` (`feGroup`)",
"ALTER TABLE `FormElement` ADD `adminNote` TEXT NOT NULL AFTER `note`",
],
diff --git a/extension/Classes/Core/Helper/Support.php b/extension/Classes/Core/Helper/Support.php
index 2212b8664c9a95cb0e52499278dcad6a447f9396..77a77765efa70b6e014a0b259f00b1948b3115f8 100644
--- a/extension/Classes/Core/Helper/Support.php
+++ b/extension/Classes/Core/Helper/Support.php
@@ -160,8 +160,8 @@ class Support {
/**
* Extract Tag(s) from $tag (eg: <div><input class="form-control">, might contain further attributes) and wrap it
- * around
- * $value. If $flagOmitEmpty==true && $value=='': return ''.
+ * around $value.
+ * If $flagOmitEmpty==true && $value=='': return ''.
*
* @param string $tag
* @param string $value
diff --git a/extension/Classes/Core/QuickFormQuery.php b/extension/Classes/Core/QuickFormQuery.php
index 05eeb74e16153b41b4a12b4456bb11346dc6d210..a1c4d3b897717db00df6e9ae3b4dd0f87cd84da1 100644
--- a/extension/Classes/Core/QuickFormQuery.php
+++ b/extension/Classes/Core/QuickFormQuery.php
@@ -1802,7 +1802,11 @@ class QuickFormQuery {
if ($this->t3data[T3DATA_REPORT_PATH_FILENAME] !== '') {
$bodytext = $this->t3data[T3DATA_BODYTEXT_RAW];
}
- $html .= $this->buildInlineReport($this->t3data[T3DATA_UID] ?? null, $this->t3data[T3DATA_REPORT_PATH_FILENAME] ?? null, $this->dbArray[$this->dbIndexData], $bodytext ?? null);
+
+ $tooltip = 'tt-content: uid=' . $this->t3data['uid'] . ', header=' . $this->t3data['header'];
+ $html .= $this->buildInlineReport($this->t3data[T3DATA_UID] ?? null,
+ $this->t3data[T3DATA_REPORT_PATH_FILENAME] ?? null, $this->dbArray[$this->dbIndexData],
+ $bodytext ?? null, null, null, $tooltip);
}
$html .= $report->process($this->t3data[T3DATA_BODYTEXT]);
@@ -1827,7 +1831,8 @@ class QuickFormQuery {
$t3vars = T3Info::getVars();
$icon = Support::renderGlyphIcon('glyphicon-edit');
$showFormJs = '$("#tt-content-edit-' . $uid . '").toggleClass("hidden")';
- $toggleBtn = Support::wrapTag("<a class='targetEditReport $btnClass' onclick='$showFormJs' style='float:right;' title='$btnTooltip'>", $icon . ' ' . $buttonText);
+ $toggleBtn = Support::wrapTag("<a class='targetEditReport $btnClass' onclick='$showFormJs' style='float:right;' title='"
+ . htmlentities($btnTooltip, ENT_QUOTES) . "'>", $icon . ' ' . $buttonText);
$ttContentParam = $db->getBodyText($uid, false);
$pageParam = $db->getPageParam($ttContentParam[COLUMN_PID], false);
diff --git a/extension/Classes/Sql/qfqDefaultTables.sql b/extension/Classes/Sql/qfqDefaultTables.sql
index a79c046ac09ba1bbd601006590ee2ae3112d0a0e..c340d150ffbea59fee8d93a580bc63d35fb7f12b 100644
--- a/extension/Classes/Sql/qfqDefaultTables.sql
+++ b/extension/Classes/Sql/qfqDefaultTables.sql
@@ -109,7 +109,6 @@ CREATE TABLE IF NOT EXISTS `FormElement`
`parameterLanguageD` TEXT NOT NULL,
`clientJs` TEXT NOT NULL,
- `feGroup` VARCHAR(255) NOT NULL DEFAULT '',
`deleted` ENUM ('yes', 'no') NOT NULL DEFAULT 'no',
`modified` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`created` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -118,9 +117,7 @@ CREATE TABLE IF NOT EXISTS `FormElement`
KEY `formId` (`formId`),
KEY `formId_class_enabled_deleted` (`formId`, `class`, `enabled`, `deleted`),
KEY `feIdContainer` (`feIdContainer`),
- KEY `ord` (`ord`),
- KEY `feGroup` (`feGroup`)
-
+ KEY `ord` (`ord`)
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8
diff --git a/extension/Resources/Private/Form/copyForm.json b/extension/Resources/Private/Form/copyForm.json
index 99cfd193a84babdfcde1cfc99f98a93d37f72e04..963cc8d51d7f16aa16b9add325e233ac70d28640 100644
--- a/extension/Resources/Private/Form/copyForm.json
+++ b/extension/Resources/Private/Form/copyForm.json
@@ -67,7 +67,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -107,7 +106,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -147,7 +145,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -187,7 +184,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -227,7 +223,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -267,7 +262,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
diff --git a/extension/Resources/Private/Form/cron.json b/extension/Resources/Private/Form/cron.json
index 73c032238c316819722f717f46951f68a1f9644b..cad94e44502adf928c18e8836939dc8d4b332764 100644
--- a/extension/Resources/Private/Form/cron.json
+++ b/extension/Resources/Private/Form/cron.json
@@ -67,7 +67,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -107,7 +106,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -147,7 +145,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -187,7 +184,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -227,7 +223,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -267,7 +262,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -307,7 +301,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -347,7 +340,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -387,7 +379,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -427,7 +418,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -467,7 +457,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -507,7 +496,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -547,7 +535,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
diff --git a/extension/Resources/Private/Form/form.json b/extension/Resources/Private/Form/form.json
index 76dce8636b95e357813492e822957432b93ba757..0ebb76222dc46e5160b76b23be432cffb0acd8e6 100644
--- a/extension/Resources/Private/Form/form.json
+++ b/extension/Resources/Private/Form/form.json
@@ -67,7 +67,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -107,7 +106,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -147,7 +145,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -187,7 +184,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -228,7 +224,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -269,7 +264,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -310,7 +304,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -351,7 +344,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -392,7 +384,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -433,7 +424,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -474,7 +464,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -515,7 +504,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -555,7 +543,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -596,7 +583,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -637,7 +623,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -678,7 +663,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -719,7 +703,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -760,7 +743,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -801,7 +783,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -842,7 +823,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -882,7 +862,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -923,7 +902,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -964,7 +942,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1005,7 +982,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1046,7 +1022,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1087,7 +1062,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1128,7 +1102,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1169,7 +1142,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1210,7 +1182,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1251,7 +1222,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -1291,7 +1261,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1332,7 +1301,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1373,7 +1341,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -1413,7 +1380,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1454,7 +1420,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1495,7 +1460,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1536,7 +1500,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1577,7 +1540,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1618,7 +1580,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2022-06-03 15:18:07",
"created": "2022-06-03 15:17:24"
@@ -1658,7 +1619,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2022-06-03 15:19:42",
"created": "2022-06-03 15:06:55",
diff --git a/extension/Resources/Private/Form/formElement.json b/extension/Resources/Private/Form/formElement.json
index f0b0ce561e6eae5217a3245a4d201b95d00052c9..d68c9c01ce18b8ffc9f6b4cd39e8a4cad015ebde 100644
--- a/extension/Resources/Private/Form/formElement.json
+++ b/extension/Resources/Private/Form/formElement.json
@@ -67,7 +67,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -107,7 +106,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -148,7 +146,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -189,7 +186,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -230,7 +226,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2022-18-05 15:30:41",
"created": "2022-18-05 15:30:41",
@@ -270,7 +265,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2022-18-05 15:30:41",
"created": "2022-18-05 15:30:41",
@@ -311,7 +305,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -352,7 +345,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -393,7 +385,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -434,7 +425,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -475,7 +465,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -516,7 +505,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -557,7 +545,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -598,7 +585,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -639,7 +625,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -680,7 +665,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -721,7 +705,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -762,7 +745,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -802,7 +784,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -843,7 +824,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -884,7 +864,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -925,7 +904,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -966,7 +944,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1007,7 +984,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -1047,7 +1023,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1088,7 +1063,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1129,7 +1103,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1170,7 +1143,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1211,7 +1183,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1252,7 +1223,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1293,7 +1263,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1334,7 +1303,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1375,7 +1343,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1416,7 +1383,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1457,7 +1423,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -1497,7 +1462,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1538,7 +1502,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1579,7 +1542,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41",
@@ -1620,7 +1582,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -1660,7 +1621,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-06 12:05:41",
"created": "2021-04-06 12:05:41"
@@ -1702,7 +1662,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2022-08-28 09:41:12",
"created": "2022-08-28 09:37:36"
@@ -1744,7 +1703,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2022-08-28 09:40:13",
"created": "2022-08-28 09:40:13",
diff --git a/extension/Resources/Private/Form/formJson.json b/extension/Resources/Private/Form/formJson.json
index f865068dbe469470339d5f983345e47d9c63fb81..c8dc30d700f537375cbd6710ff181507c505cc8f 100644
--- a/extension/Resources/Private/Form/formJson.json
+++ b/extension/Resources/Private/Form/formJson.json
@@ -67,7 +67,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-09 11:38:15",
"created": "2021-03-22 11:57:51"
@@ -107,7 +106,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-22 15:27:31",
"created": "2021-03-22 11:44:22"
@@ -147,7 +145,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-09 11:38:15",
"created": "2021-04-08 10:40:09"
@@ -187,7 +184,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-22 15:30:18",
"created": "2021-04-22 15:11:12"
@@ -227,7 +223,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-09 11:38:15",
"created": "2021-03-24 14:44:04"
@@ -267,7 +262,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-09 11:38:15",
"created": "2021-03-30 09:13:40"
@@ -307,7 +301,6 @@
"parameterLanguageC": "",
"parameterLanguageD": "",
"clientJs": "",
- "feGroup": "",
"deleted": "no",
"modified": "2021-04-09 11:38:15",
"created": "2021-03-30 09:14:48"
diff --git a/extension/Tests/Unit/Core/Database/fixtures/TestFormEditor.sql b/extension/Tests/Unit/Core/Database/fixtures/TestFormEditor.sql
index 4e6729a50ff31096d6848b58b6ae15bb2e91f2a6..f6c1aaeae7dbf42e0f1f84ca5235324e5e3e6ade 100644
--- a/extension/Tests/Unit/Core/Database/fixtures/TestFormEditor.sql
+++ b/extension/Tests/Unit/Core/Database/fixtures/TestFormEditor.sql
@@ -104,7 +104,6 @@ CREATE TABLE IF NOT EXISTS `FormElement`
`parameterLanguageD` TEXT NOT NULL,
`clientJs` TEXT NOT NULL,
- `feGroup` VARCHAR(255) NOT NULL DEFAULT '',
`deleted` ENUM ('yes', 'no') NOT NULL DEFAULT 'no',
`modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
ON UPDATE CURRENT_TIMESTAMP,
@@ -114,9 +113,7 @@ CREATE TABLE IF NOT EXISTS `FormElement`
KEY `formId` (`formId`),
KEY `formId_class_enabled_deleted` (`formId`, `class`, `enabled`, `deleted`),
KEY `feIdContainer` (`feIdContainer`),
- KEY `ord` (`ord`),
- KEY `feGroup` (`feGroup`)
-
+ KEY `ord` (`ord`)
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8
@@ -237,7 +234,6 @@ VALUES
(130, 2, 'sql1', 'sql1', 'show', 'text', 'native', 130, '40,4', 255, '', '', '', '', '', '', 103, 'no', ''),
(131, 2, 'parameter', 'Parameter', 'show', 'text', 'native', 130, '40,4', 255, '', '', '', '', '', '', 103, 'no', ''),
(132, 2, 'clientJs', 'ClientJS', 'show', 'text', 'native', 130, 40, 255, '', '', '', '', '', '', 103, 'no', ''),
- (133, 2, 'feGroup', 'feGroup', 'show', 'text', 'native', 130, 40, 255, '', '', '', '', '', '', 104, 'no', ''),
(134, 2, 'debug', 'Debug', 'show', 'checkbox', 'native', 130, 0, 0, '', '', '', '', '', '', 104, 'no', ''),
(135, 2, 'deleted', 'Deleted', 'show', 'checkbox', 'native', 400, 0, 0, '', '', '', '', '', '', 104, 'no', ''),
(136, 2, 'modified', 'Modified', 'readonly', 'text', 'native', 410, 40, 20, '', '', '', '', '', '', 104, 'no', ''),