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

Merge branch 'develop' into 'master'

Develop

See merge request !273
parents cc75c271 f9f960cf
No related branches found
No related tags found
2 merge requests!286Master,!273Develop
Pipeline #3567 passed
...@@ -155,7 +155,7 @@ Setup ...@@ -155,7 +155,7 @@ Setup
* Read for `.../typo3conf/ext/qfq/*` * Read for `.../typo3conf/ext/qfq/*`
* Write, if a logfile should be written (specified per cron job) in the custom specified directory. * Write, if a logfile should be written (specified per cron job) in the custom specified directory.
Cron task: :: Cron task (user cron tab): ::
* * * * * /usr/bin/php /var/www/html/typo3conf/ext/qfq/Classes/External/autocron.php * * * * * /usr/bin/php /var/www/html/typo3conf/ext/qfq/Classes/External/autocron.php
......
...@@ -373,6 +373,7 @@ class Save { ...@@ -373,6 +373,7 @@ class Save {
// Create glue records // Create glue records
foreach ($result as $id => $value) { foreach ($result as $id => $value) {
$this->store->setVar(VAR_TAG_ID, $id, STORE_VAR); $this->store->setVar(VAR_TAG_ID, $id, STORE_VAR);
$this->store->setVar(VAR_TAG_VALUE, $value, STORE_VAR); $this->store->setVar(VAR_TAG_VALUE, $value, STORE_VAR);
......
...@@ -295,12 +295,19 @@ class FillStoreForm { ...@@ -295,12 +295,19 @@ class FillStoreForm {
(isset($formElement[FE_PROCESS_READ_ONLY]) && $formElement[FE_PROCESS_READ_ONLY] != '0')) { (isset($formElement[FE_PROCESS_READ_ONLY]) && $formElement[FE_PROCESS_READ_ONLY] != '0')) {
if (HelperFormElement::booleParameter($formElement[FE_TYPEAHEAD_TAG] ?? '-')) { if (HelperFormElement::booleParameter($formElement[FE_TYPEAHEAD_TAG] ?? '-')) {
// TypeAhead Tags received as JSON key/value
$cntNew = 0;
// TYPEAHEAD_TAG will be delivered as JSON. Check and sanitize every key/value pair. // TYPEAHEAD_TAG will be delivered as JSON. Check and sanitize every key/value pair.
$arr = json_decode($clientValues[$clientFieldName], true); $arr = json_decode($clientValues[$clientFieldName], true);
$arrTmp = array(); $arrTmp = array();
foreach ($arr as $row) { foreach ($arr as $row) {
$arrKey = $this->doValue($formElement, $formMode, $row['key']); $arrKey = $this->doValue($formElement, $formMode, $row['key']);
// New Tags always get '0' >> make them uniq by adding a counter.
if ($arrKey == "0") {
$arrKey = "0-" . ++$cntNew;
}
$arrValue = $this->doValue($formElement, $formMode, $row['value']); $arrValue = $this->doValue($formElement, $formMode, $row['value']);
$arrTmp[$arrKey] = $arrValue; $arrTmp[$arrKey] = $arrValue;
} }
......
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