Commit a44785c3 authored by bbaer's avatar bbaer
Browse files

Merge remote-tracking branch 'origin/punktetool' into punktetool

parents e4bed66d b3635483
......@@ -37,6 +37,27 @@ Bug Fixes
^^^^^^^^^
Version 0.25.14
---------------
Date: 14.03.2018
Notes
^^^^^
Features
^^^^^^^^
* Change notification from 'save: success' to 'Save' and 'delete: success' to 'Delete'
* DB update: write intermediate QFQ version after every step.
Bug Fixes
^^^^^^^^^
* #5652 / TypeAheadSql: destroyed SQL statement. Fixed broken compare and missing init of $sqlTest.
* #5668 / Fix Broken SIP after login.
Version 0.25.13
---------------
......
......@@ -47,8 +47,8 @@ Neue Versionsnummer
6) **New Tag**:
git tag v0.25.13
git push -u origin v0.25.13
git tag v0.25.14
git push -u origin v0.25.14
7) PhpStorm: **Sync** all files to VM qfq.
......
......@@ -802,7 +802,7 @@ Base: T3 & QFQ
QFQ typically interacts with one database, the QFQ database. The database used by Typo3 is typically a separate one.
Theoretically it might be the same (never tested), but it's strongly recommended to use a separated QFQ database to have
no problems on Typo3 updates and to have a clean separation between Typo3 and QFQ
no problems on Typo3 updates and to have a clean separation between Typo3 and QFQ
QFQ: System & Data
''''''''''''''''''
......@@ -829,7 +829,7 @@ A `Form` will:
* load the own definition from `DB_INDEX_QFQ` (table `Form` and `FormElement`),
* loads and save data from/in `DB_INDEX_DATA` (config.qfq.in) / `dbIndex` (form.parameter.dbIndex),
* retrieve extra information via `dbIndexExtra` - this is useful to offer information from a database and save them in a
different one.
different one.
The simplest setup, QFQ system & data in the same database, needs no DB_INDEX_QFQ / DB_INDEX_DATA definition in
`config.qfq.ini` or one or both of them set to '1'
......@@ -3445,7 +3445,7 @@ See also `downloadButton`_ to offer a download of an uploaded file.
* In :ref:`Upload advanced mode` the `fileSize` and / or `mimeType` have to be updated with an explicit SQL statement::
sqlAfter = {{UPDATE Data SET mimeType='{{mimeType:V}}', fileSize={{fileSize:V}} WHERE id={{id:R}} }}
sqlAfter = {{UPDATE Data SET mimeType='{{mimeType:V}}', fileSize={{fileSize:V}} WHERE id={{id:R}} }}
* *fileReplace=always*: If `fileDestination` exist - replace it by the new one.
......
......@@ -37,6 +37,27 @@ Bug Fixes
^^^^^^^^^
Version 0.25.14
---------------
Date: 14.03.2018
Notes
^^^^^
Features
^^^^^^^^
* Change notification from 'save: success' to 'Save' and 'delete: success' to 'Delete'
* DB update: write intermediate QFQ version after every step.
Bug Fixes
^^^^^^^^^
* #5652 / TypeAheadSql: destroyed SQL statement. Fixed broken compare and missing init of $sqlTest.
* #5668 / Fix Broken SIP after login.
Version 0.25.13
---------------
......
......@@ -3,7 +3,7 @@
project = QFQ - Quick Form Query
version = 0.25
release = 0.25.13
release = 0.25.14
t3author = Carsten Rose
copyright = since 2017 by the author
......
......@@ -59,7 +59,7 @@ copyright = u'2017, Carsten Rose'
# The short X.Y version.
version = '0.25'
# The full version, including alpha/beta/rc tags.
release = '0.25.13'
release = '0.25.14'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -37,6 +37,27 @@ Bug Fixes
^^^^^^^^^
Version 0.25.14
---------------
Date: 14.03.2018
Notes
^^^^^
Features
^^^^^^^^
* Change notification from 'save: success' to 'Save' and 'delete: success' to 'Delete'
* DB update: write intermediate QFQ version after every step.
Bug Fixes
^^^^^^^^^
* #5652 / TypeAheadSql: destroyed SQL statement. Fixed broken compare and missing init of $sqlTest.
* #5668 / Fix Broken SIP after login.
Version 0.25.13
---------------
......
......@@ -10,6 +10,6 @@ $EM_CONF[$_EXTKEY] = array(
'dependencies' => 'fluid,extbase',
'clearcacheonload' => true,
'state' => 'alpha',
'version' => '0.25.13'
'version' => '0.25.14'
);
......@@ -1265,14 +1265,16 @@ abstract class AbstractBuildForm {
$sql = trim($sql);
if ($sql[0] = '[') {
if ($sql[0] == '[') {
// Remove optional existing dbIndex token.
$pos = strpos($sql, ']');
$sqlTest = substr($sql, $pos + 1);
} else {
$sqlTest = $sql;
}
if (false === stristr(substr($sqlTest, 0, 7), 'SELECT ')) {
throw new UserFormException("Expect a SELECT statement in " . FE_TYPEAHEAD_SQL . " - got: " . $sql, ERROR_BROKEN_PARAMETER);
throw new UserFormException("Expect a SELECT statement in " . FE_TYPEAHEAD_SQL . " - got: " . $sqlTest, ERROR_BROKEN_PARAMETER);
}
if (false === stristr($sql, ' LIMIT ')) {
......
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