Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
typo3
qfq
Commits
ab7d7ff8
Commit
ab7d7ff8
authored
Oct 16, 2019
by
Marc Egger
Browse files
Merge remote-tracking branch 'origin/master' into F5695-Multiform
parents
ed5ec89a
6c009759
Pipeline
#2487
passed with stages
in 2 minutes and 58 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
ab7d7ff8
...
...
@@ -29,6 +29,7 @@ snapshot:
script
:
-
make VERSION=$VERSION phpunit_snapshot
-
chmod a+r qfq_$VERSION_*.zip
-
echo "qfq_$VERSION_*.zip qfq_${VERSION}_${RELDATE}-${CI_BUILD_REF_NAME}.zip"
-
mv qfq_$VERSION_*.zip qfq_${VERSION}_${RELDATE}-${CI_BUILD_REF_NAME}.zip
-
scp qfq_$VERSION_*.zip w16:qfq/snapshots/
-
mv qfq_$VERSION_*.zip build/qfq.zip
...
...
Documentation/Manual.rst
View file @
ab7d7ff8
...
...
@@ -1937,7 +1937,7 @@ Store: *VARS* - V
The directive `fillStoreVar` will fill the store VARS with custom values. Existing Store VARS values will be merged together with them.
E.g.: ::
fillStoreVar = {{SELECT p.name, p.email FROM Person AS p WHERE p.id={{pId:S}} }}
fillStoreVar = {{
!
SELECT p.name, p.email FROM Person AS p WHERE p.id={{pId:S}} }}
* After filling the store, the values can be retrieved via `{{name:V}}` and `{{email:V}}`.
* Be careful by specifying general purpose variables like `id`, `r`, `pageId` and so on. This might conflict with existing variables.
...
...
@@ -4761,7 +4761,7 @@ On `Form.parameter` define a `fillStoreVar` query with a column name equal to a
Example: ::
FormElement.name = technicalContact
Form.parameter.fillStoreVar = {{SELECT CONCAT(p.firstName, ' ', p.name) AS technicalContact FROM Person AS p WHERE p.account='{{feUser:T}}' }}
Form.parameter.fillStoreVar = {{
!
SELECT CONCAT(p.firstName, ' ', p.name) AS technicalContact FROM Person AS p WHERE p.account='{{feUser:T}}' }}
What we use here is the default STORE prio FSRVD. If the form loads with r=0, 'F', 'S' and 'R' are empty. 'V' is filled.
If r>0, than 'F' and 'S' are empty and 'R' is filled.
...
...
extension/Classes/Core/Helper/DownloadPage.php
View file @
ab7d7ff8
...
...
@@ -52,19 +52,19 @@ class DownloadPage {
"verify_peer"
=>
false
,
"verify_peer_name"
=>
false
,
),
'http'
=>
array
(
'timeout'
=>
1200
,
),
);
if
(
isset
(
$_COOKIE
[
SESSION_NAME
]))
{
$cookie
=
array
(
$cookie
_http
=
array
(
// Copy cookie: to forward current QFQ user session
'http'
=>
array
(
'method'
=>
"GET"
,
'header'
=>
"Accept-language: en
\r\n
"
.
"Cookie: "
.
SESSION_NAME
.
"="
.
$_COOKIE
[
SESSION_NAME
]
.
"
\r\n
"
,
'timeout'
=>
600
,
),
'method'
=>
"GET"
,
'header'
=>
"Accept-language: en
\r\n
"
.
"Cookie: "
.
SESSION_NAME
.
"="
.
$_COOKIE
[
SESSION_NAME
]
.
"
\r\n
"
,
);
$ctx
=
array_merge
(
$ctx
,
$cookie
);
$ctx
[
'http'
]
=
array_merge
(
$ctx
[
'http'
]
,
$cookie
_http
);
}
// The current session needs to be closed, cause the SESSION needs to be opened again by processing get_file_contents()
...
...
javascript/src/QfqForm.js
View file @
ab7d7ff8
...
...
@@ -60,7 +60,7 @@ var QfqNS = QfqNS || {};
};
if
(
!!
$
(
'
#
'
+
QfqNS
.
escapeJqueryIdSelector
(
this
.
formId
)).
data
(
'
enable-save-button
'
))
{
this
.
form
=
new
n
.
Form
(
this
.
formId
,
tru
e
);
this
.
form
=
new
n
.
Form
(
this
.
formId
,
fals
e
);
this
.
getSaveButton
().
removeClass
(
"
disabled
"
).
removeAttr
(
"
disabled
"
);
}
else
{
this
.
getSaveButton
().
addClass
(
"
disabled
"
).
attr
(
"
disabled
"
,
"
disabled
"
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment