Merge branch 'B10641TypeAheadTagFehlerBeimAnlegenMehrererTags' into 'develop'

B10641 type ahead tag fehler beim anlegen mehrerer tags

See merge request !272

.gitignore

@@ -72,3 +72,4 @@ composer.lock
 /docker/chromedriver
 /docker/geckodriver
 /docker/run_qfq_docker.output
+package-lock.json

CHANGELOG.md

@@ -36,6 +36,17 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
+Version 20.6.1
+--------------
+
+Date: 24.06.2020
+
+Features
+^^^^^^^^
+
+ * #10778 / Upload ZIP and unpack
+
+
 Version 20.6.0
 --------------
 
@@ -48,6 +59,7 @@ Notes
    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
    in individual files.
+ * For the image to PDF feature, installation of `img2pdf` is required (please check `preparation`_).
 
 Features
 ^^^^^^^^

Documentation-develop/NewVersion.md

@@ -44,7 +44,7 @@ Neue Versionsnummer
 
    **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:
      * extension/Documentation/_make/conf.py: release, version-
@@ -60,12 +60,12 @@ Neue Versionsnummer
    * Update the version number in this document (topic 6)
    * Commit & Push new version changes to master branch:
 
-      New version 20.6.0
+      New version 20.6.1
 
 7) **New Tag**:
 
-   git tag v20.6.0
-   git push -u origin v20.6.0
+   git tag v20.6.1
+   git push -u origin v20.6.1
 
 8) **Merge 'master' into 'develop'**
 

Documentation-develop/SETUP.md

+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 
+

Documentation/Release.rst

@@ -36,6 +36,17 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
+Version 20.6.1
+--------------
+
+Date: 24.06.2020
+
+Features
+^^^^^^^^
+
+ * #10778 / Upload ZIP and unpack
+
+
 Version 20.6.0
 --------------
 

Documentation/Settings.cfg

@@ -22,7 +22,7 @@
 
 project = QFQ - Quick Form Query
 version = 20.6
-release = 20.6.0
+release = 20.6.1
 t3author = Carsten Rose
 copyright = since 2017 by the author
 

extension/Classes/Core/Save.php

@@ -373,6 +373,7 @@ class Save {
 
         // Create glue records
         foreach ($result as $id => $value) {
+
             $this->store->setVar(VAR_TAG_ID, $id, STORE_VAR);
             $this->store->setVar(VAR_TAG_VALUE, $value, STORE_VAR);
 

extension/Classes/Core/Store/FillStoreForm.php

@@ -295,12 +295,19 @@ class FillStoreForm {
                     (isset($formElement[FE_PROCESS_READ_ONLY]) && $formElement[FE_PROCESS_READ_ONLY] != '0')) {
 
                     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.
                         $arr = json_decode($clientValues[$clientFieldName], true);
                         $arrTmp = array();
                         foreach ($arr as $row) {
 
                             $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']);
                             $arrTmp[$arrKey] = $arrValue;
                         }

extension/RELEASE.txt

@@ -36,6 +36,17 @@ Features
 Bug Fixes
 ^^^^^^^^^
 
+Version 20.6.1
+--------------
+
+Date: 24.06.2020
+
+Features
+^^^^^^^^
+
+ * #10778 / Upload ZIP and unpack
+
+
 Version 20.6.0
 --------------
 
@@ -48,6 +59,7 @@ Notes
    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
    in individual files.
+ * For the image to PDF feature, installation of `img2pdf` is required (please check `preparation`_).
 
 Features
 ^^^^^^^^

extension/ext_emconf.php

@@ -12,7 +12,7 @@ $EM_CONF[$_EXTKEY] = array(
     'dependencies' => 'fluid,extbase',
     'clearcacheonload' => true,
     'state' => 'stable',
-    'version' => '20.6.0',
+    'version' => '20.6.1',
     'constraints' => [
         'depends' => [
             'typo3' => '7.0.0-9.2.99',

version

-20.6.0
+20.6.1