Commit 181a9c94 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch '5878-form-report-improvements'

# Conflicts:
#	extension/qfq/qfq/AbstractBuildForm.php
parents 90111184 3b1404f6
...@@ -2514,7 +2514,8 @@ Fields: ...@@ -2514,7 +2514,8 @@ Fields:
+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+ +---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
|Maxlength | string |Maximum characters for input. _`field-maxLength` | |Maxlength | string |Maximum characters for input. _`field-maxLength` |
+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+ +---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
|Note | string |Note of *FormElement*. Depending on layout model, right or below of the *FormElement*. _`field-note` | |Note | string |Note of *FormElement*. Depending on layout model, right or below of the *FormElement*. |
| | |Report syntax can also be used, see _`report-notation` |
+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+ +---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
|Tooltip | text |Display this text as tooltip on mouse over. _`field-tooltip` | |Tooltip | text |Display this text as tooltip on mouse over. _`field-tooltip` |
+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+ +---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
...@@ -2550,6 +2551,10 @@ to edit, on the same form, a corresponding person email address (which is in a s ...@@ -2550,6 +2551,10 @@ to edit, on the same form, a corresponding person email address (which is in a s
{{SELECT a.email FROM Address AS a WHERE a.pId={{id:R0}} ORDER BY a.id LIMIT 1}} {{SELECT a.email FROM Address AS a WHERE a.pId={{id:R0}} ORDER BY a.id LIMIT 1}}
Report syntax can also be used, see _`report-notation`.
.. _`report-notation`:
FE: 'Report' notation FE: 'Report' notation
^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^
......
...@@ -493,7 +493,6 @@ abstract class AbstractBuildForm { ...@@ -493,7 +493,6 @@ abstract class AbstractBuildForm {
* @return array|string * @return array|string
* @throws CodeException * @throws CodeException
* @throws DbException * @throws DbException
* @throws DownloadException
* @throws UserFormException * @throws UserFormException
* @throws UserReportException * @throws UserReportException
* @throws DownloadException * @throws DownloadException
...@@ -511,7 +510,8 @@ abstract class AbstractBuildForm { ...@@ -511,7 +510,8 @@ abstract class AbstractBuildForm {
return $new; return $new;
} }
if (substr($value, 0, strlen(SHEBANG_REPORT)) == SHEBANG_REPORT) { $value = trim($value);
if (substr($value, 0, 8) == SHEBANG_REPORT) {
if ($this->report === null) { if ($this->report === null) {
$this->report = new Report(array(), $this->evaluate, false); $this->report = new Report(array(), $this->evaluate, false);
} }
......
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