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

Merge branch 'corrections' into 'master'

Corrections

See merge request !188
parents d52cba21 052d9529
Pipeline #2541 passed with stages
in 2 minutes and 37 seconds
......@@ -1458,14 +1458,14 @@ SQL variables
* INSERT, UPDATE, DELETE, REPLACE, TRUNCATE
* SHOW, DESCRIBE, EXPLAIN, SET
* A SQL Statement might contain variables, including additional SQL statements. Inner SQL queries will be executed first.
* An SQL Statement might contain variables, including additional SQL statements. Inner SQL queries will be executed first.
* All variables will be substituted one by one from inner to outer.
* The number of variables inside an input field or a SQL statement is not limited.
* The number of variables inside an input field or an SQL statement is not limited.
Result: string
""""""""""""""
A result of a SQL statement will be imploded over all: concat all columns of a row, concat all rows - there is no
A result of an SQL statement will be imploded over all: concat all columns of a row, concat all rows - there is no
glue string.
Result: row
......@@ -1545,7 +1545,7 @@ For better reading, the format string might be wrapped in single or double quote
These variables are especially helpful in:
* `report`, to create create links or buttons outside of a SQL statement. E.g. in `head`, `rbeg`, ...
* `report`, to create create links or buttons outside of an SQL statement. E.g. in `head`, `rbeg`, ...
* `form`, to create links and buttons in labels or notes.
Security
......@@ -2196,7 +2196,7 @@ General
* *Multi* form: the form acts simultaneously on more than one record. All records use the same *FormElements*.
* The *FormElements* are defined as a regular *simple* / or *advanced* form, plus a SQL Query, which selects and
* The *FormElements* are defined as a regular *simple* / or *advanced* form, plus an SQL Query, which selects and
iterates over all records. Those records will be loaded at the same time.
* *Delete* form: any form can be used as a form to `delete-record`_.
......@@ -2539,7 +2539,7 @@ Parameter
+-----------------------------+--------+----------------------------------------------------------------------------------------------------------+
| typeAheadLdap | | Enable LDAP as 'Typeahead' data source. |
+-----------------------------+--------+----------------------------------------------------------------------------------------------------------+
| typeAheadLdapSearch | string | Regular LDAP search expresssion. E.g.: `(|(cn=*?*)(mail=*?*))` |
| typeAheadLdapSearch | string | Regular LDAP search expression. E.g.: `(|(cn=*?*)(mail=*?*))` |
+-----------------------------+--------+----------------------------------------------------------------------------------------------------------+
| typeAheadLdapValuePrintf | string | Value formatting of LDAP result, per entry. E.g.: `'%s / %s / %s', mail, roomnumber, telephonenumber` |
+-----------------------------+--------+----------------------------------------------------------------------------------------------------------+
......@@ -2842,7 +2842,7 @@ Additional logic is required to load, update, insert and/or delete slave records
Load
;;;;
On each native *FormElement* of the *templateGroup* define a SQL query in the *FormElement.value* field. The query has to
On each native *FormElement* of the *templateGroup* define an SQL query in the *FormElement.value* field. The query has to
select **all** values of all possible existing copies of the *FormElement* - therefore the exclamation mark is necessary.
Also define the order. E.g. *FormElement.value*::
......@@ -3647,7 +3647,7 @@ Type: subrecord
^^^^^^^^^^^^^^^
The *FormElement* type 'subrecord' renders a list of records (so called secondary records), typically to show, edit, delete
or add new records. The list is defined as a SQL query. The number of records shown is not limited. These *FormElement*
or add new records. The list is defined as an SQL query. The number of records shown is not limited. These *FormElement*
will be rendered inside the form as a HTML table.
* *mode / modeSql* = `<type/value>`
......@@ -4097,7 +4097,7 @@ Types:
Parameter: sqlValidate
""""""""""""""""""""""
Perform checks by fireing a SQL query and expecting a predefined number of selected records.
Perform checks by firing an SQL query and expecting a predefined number of selected records.
* OK: the `expectRecords` number of records has been selected. Continue processing the next *FormElement*.
* Fail: the `expectRecords` number of records has not been selected (less or more): Display the error message
......@@ -4341,7 +4341,7 @@ Variables
* Form.parameter.fillStoreVar / FormElement.parameter.fillStoreVar
A SQL statement will fill STORE_VARS. Such values can be used during form load and/or save.
An SQL statement will fill STORE_VARS. Such values can be used during form load and/or save.
Action
^^^^^^
......@@ -4364,7 +4364,7 @@ Multi Form
+------------------+----------------------------------+------------------------------------------------+
| Name | | |
+==================+==================================+================================================+
| multiSql | {{!SELECT id, name FROM Person}} | Query to select MulitForm records |
| multiSql | {{!SELECT id, name FROM Person}} | Query to select MulitForm records |
+------------------+----------------------------------+------------------------------------------------+
| multiMgsNoRecord | Default: No data | Message shown if `multiSql` selects no records |
+------------------+----------------------------------+------------------------------------------------+
......@@ -5339,7 +5339,7 @@ Assume that the database has a table person with columns firstName and lastName.
10.sql = SELECT firstName, lastName FROM person
The '10' indicates a *root level* of the report (see section `Structure`_). The expresssion '10.sql' defines a SQL query
The '10' indicates a *root level* of the report (see section `Structure`_). The expression '10.sql' defines an SQL query
for the specific level. When the query is executed, it will return a result having one single column name containing first and last name
separated by a space character.
......@@ -7658,7 +7658,7 @@ to the file is SIP protected. Any file on the server is possible.
10.head = <pre id="monitor-1">Please wait</pre>
* On the same Typo3 page, define a SQL column '_monitor' with the necessary parameter::
* On the same Typo3 page, define an SQL column '_monitor' with the necessary parameter::
10.sql = SELECT 'file:fileadmin/protected/log/sql.log|tail:50|append:1|refresh:1000|htmlId:monitor-1' AS _monitor
......@@ -8682,7 +8682,7 @@ Tip on Report: In case the query did not contain any double ticks, just wrap all
Error read file config.qfq.php: syntax error on line xx
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Check the given line number. If it's a SQL statement, enclose it in single or double ticks.
Check the given line number. If it's an SQL statement, enclose it in single or double ticks.
Output a text, substitute embedded QFQ variables
......
Markdown is supported
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