Commit 8bce6c8a authored by Benjamin Baer's avatar Benjamin Baer
Browse files

Merge branch 'master' into 'b9329-annotations'

# Conflicts:
#   .gitlab-ci.yml
parents 7316da5c 6c009759
Pipeline #2500 passed with stages
in 2 minutes and 42 seconds
...@@ -1937,7 +1937,7 @@ Store: *VARS* - V ...@@ -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. The directive `fillStoreVar` will fill the store VARS with custom values. Existing Store VARS values will be merged together with them.
E.g.: :: 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}}`. * 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. * Be careful by specifying general purpose variables like `id`, `r`, `pageId` and so on. This might conflict with existing variables.
...@@ -4704,7 +4704,7 @@ On `Form.parameter` define a `fillStoreVar` query with a column name equal to a ...@@ -4704,7 +4704,7 @@ On `Form.parameter` define a `fillStoreVar` query with a column name equal to a
Example: :: Example: ::
FormElement.name = technicalContact 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. 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. If r>0, than 'F' and 'S' are empty and 'R' is filled.
......
...@@ -52,19 +52,19 @@ class DownloadPage { ...@@ -52,19 +52,19 @@ class DownloadPage {
"verify_peer" => false, "verify_peer" => false,
"verify_peer_name" => false, "verify_peer_name" => false,
), ),
'http' => array(
'timeout' => 1200,
),
); );
if (isset($_COOKIE[SESSION_NAME])) { if (isset($_COOKIE[SESSION_NAME])) {
$cookie = array( $cookie_http = array(
// Copy cookie: to forward current QFQ user session // Copy cookie: to forward current QFQ user session
'http' => array( 'method' => "GET",
'method' => "GET", 'header' => "Accept-language: en\r\n" .
'header' => "Accept-language: en\r\n" . "Cookie: " . SESSION_NAME . "=" . $_COOKIE[SESSION_NAME] . "\r\n",
"Cookie: " . SESSION_NAME . "=" . $_COOKIE[SESSION_NAME] . "\r\n",
'timeout' => 600,
),
); );
$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() // The current session needs to be closed, cause the SESSION needs to be opened again by processing get_file_contents()
......
...@@ -60,7 +60,7 @@ var QfqNS = QfqNS || {}; ...@@ -60,7 +60,7 @@ var QfqNS = QfqNS || {};
}; };
if (!!$('#' + QfqNS.escapeJqueryIdSelector(this.formId)).data('enable-save-button')) { if (!!$('#' + QfqNS.escapeJqueryIdSelector(this.formId)).data('enable-save-button')) {
this.form = new n.Form(this.formId, true); this.form = new n.Form(this.formId, false);
this.getSaveButton().removeClass("disabled").removeAttr("disabled"); this.getSaveButton().removeClass("disabled").removeAttr("disabled");
} else { } else {
this.getSaveButton().addClass("disabled").attr("disabled", "disabled"); this.getSaveButton().addClass("disabled").attr("disabled", "disabled");
......
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