Commit f9f960cf authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'B10641TypeAheadTagFehlerBeimAnlegenMehrererTags' into 'develop'

B10641 type ahead tag fehler beim anlegen mehrerer tags

See merge request !272
parents e49044e4 f0c316e7
Pipeline #3566 passed with stages
in 3 minutes and 56 seconds
...@@ -72,3 +72,4 @@ composer.lock ...@@ -72,3 +72,4 @@ composer.lock
/docker/chromedriver /docker/chromedriver
/docker/geckodriver /docker/geckodriver
/docker/run_qfq_docker.output /docker/run_qfq_docker.output
package-lock.json
...@@ -36,6 +36,17 @@ Features ...@@ -36,6 +36,17 @@ Features
Bug Fixes Bug Fixes
^^^^^^^^^ ^^^^^^^^^
Version 20.6.1
--------------
Date: 24.06.2020
Features
^^^^^^^^
* #10778 / Upload ZIP and unpack
Version 20.6.0 Version 20.6.0
-------------- --------------
...@@ -48,6 +59,7 @@ Notes ...@@ -48,6 +59,7 @@ Notes
in filenames and wkhtml commandline options (like header/footer). in filenames and wkhtml commandline options (like header/footer).
* Migrate documentation from T3 to ReadTheDocs.io - looks older but 'search' is much more better. New: chapters separated * Migrate documentation from T3 to ReadTheDocs.io - looks older but 'search' is much more better. New: chapters separated
in individual files. in individual files.
* For the image to PDF feature, installation of `img2pdf` is required (please check `preparation`_).
Features Features
^^^^^^^^ ^^^^^^^^
......
...@@ -44,7 +44,7 @@ Neue Versionsnummer ...@@ -44,7 +44,7 @@ Neue Versionsnummer
**Achtung**: die Release Minor darf KEINE fuehrenden Nullen enthalten!!! Ansonsten funktioniert die Verteilung vie TER nicht. **Achtung**: die Release Minor darf KEINE fuehrenden Nullen enthalten!!! Ansonsten funktioniert die Verteilung vie TER nicht.
**Auto**: ./setVersion.sh 20.6.0 **Auto**: ./setVersion.sh 20.6.1
Manuell: Manuell:
* extension/Documentation/_make/conf.py: release, version- * extension/Documentation/_make/conf.py: release, version-
...@@ -60,12 +60,12 @@ Neue Versionsnummer ...@@ -60,12 +60,12 @@ Neue Versionsnummer
* Update the version number in this document (topic 6) * Update the version number in this document (topic 6)
* Commit & Push new version changes to master branch: * Commit & Push new version changes to master branch:
New version 20.6.0 New version 20.6.1
7) **New Tag**: 7) **New Tag**:
git tag v20.6.0 git tag v20.6.1
git push -u origin v20.6.0 git push -u origin v20.6.1
8) **Merge 'master' into 'develop'** 8) **Merge 'master' into 'develop'**
......
QFQ Development Setup
=================
Requirements
============
* Node.js
* PHP7.x - for local testing
* Python
* IDE (Used: PhpStorm, VSCode)
Mac OS X
--------
To be able to install various unix tools that are used, it is recommended to install homebrew from https://brew.sh
Afterwards use:
```brew install php@7.2 wget```
VSCode
------
It is recommended to install the standard PHP, Python and Javascript plugins (Can be selected at the start).
Additional useful Extensions:
* `Tasks Panel` - allows you to start Grunt Tasks.
* `Beautify` - Opinionated Javascript Code beautifier.
* `JSLint` - Javascript Linting for old Ecma Script.
* `PHP Debug` - Support for PHP XDebug
* `PHP IntelliSense` - Advanced Autocompletion and Refactoring for PHP
* `PHP Intelephense` - Similar features to PHPStorm (has additional premium functionality)
Preparations
------------
You can use the command `make bootstrap` from the root folder of the git QFQ project to setup your Development Enviroment.
Or run:
```
sudo npm install grunt-cli -g
npm install
grunt default
```
manually from the root directory of the git QFQ project.
Working with Mockups
--------------------
Mockups are in the `mockup` directory.
To access them, you need a locally running webserver. The easiest way is to use the local webserver provided by php.
`php -S localhost:8000`
Now you can access the mockups by going to http://localhost:8000/mockup/qfqform.html
...@@ -36,6 +36,17 @@ Features ...@@ -36,6 +36,17 @@ Features
Bug Fixes Bug Fixes
^^^^^^^^^ ^^^^^^^^^
Version 20.6.1
--------------
Date: 24.06.2020
Features
^^^^^^^^
* #10778 / Upload ZIP and unpack
Version 20.6.0 Version 20.6.0
-------------- --------------
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
project = QFQ - Quick Form Query project = QFQ - Quick Form Query
version = 20.6 version = 20.6
release = 20.6.0 release = 20.6.1
t3author = Carsten Rose t3author = Carsten Rose
copyright = since 2017 by the author copyright = since 2017 by the author
......
...@@ -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;
} }
......
...@@ -36,6 +36,17 @@ Features ...@@ -36,6 +36,17 @@ Features
Bug Fixes Bug Fixes
^^^^^^^^^ ^^^^^^^^^
Version 20.6.1
--------------
Date: 24.06.2020
Features
^^^^^^^^
* #10778 / Upload ZIP and unpack
Version 20.6.0 Version 20.6.0
-------------- --------------
...@@ -48,6 +59,7 @@ Notes ...@@ -48,6 +59,7 @@ Notes
in filenames and wkhtml commandline options (like header/footer). in filenames and wkhtml commandline options (like header/footer).
* Migrate documentation from T3 to ReadTheDocs.io - looks older but 'search' is much more better. New: chapters separated * Migrate documentation from T3 to ReadTheDocs.io - looks older but 'search' is much more better. New: chapters separated
in individual files. in individual files.
* For the image to PDF feature, installation of `img2pdf` is required (please check `preparation`_).
Features Features
^^^^^^^^ ^^^^^^^^
......
...@@ -12,7 +12,7 @@ $EM_CONF[$_EXTKEY] = array( ...@@ -12,7 +12,7 @@ $EM_CONF[$_EXTKEY] = array(
'dependencies' => 'fluid,extbase', 'dependencies' => 'fluid,extbase',
'clearcacheonload' => true, 'clearcacheonload' => true,
'state' => 'stable', 'state' => 'stable',
'version' => '20.6.0', 'version' => '20.6.1',
'constraints' => [ 'constraints' => [
'depends' => [ 'depends' => [
'typo3' => '7.0.0-9.2.99', 'typo3' => '7.0.0-9.2.99',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment