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

Merge branch 'B4545-delete-page-reload-with-sip' into 'master'

B4545 - After delete: reload page with original parameters - refs #4545, closes #4545

See merge request !106
parents eecf5e01 e762f918
Pipeline #1009 passed with stage
in 1 minute and 35 seconds
...@@ -3071,7 +3071,7 @@ SQL ...@@ -3071,7 +3071,7 @@ SQL
* *typeAheadSql* = `SELECT ... AS 'id', ... AS 'value' WHERE name LIKE ? OR firstName LIKE ? LIMIT 100` * *typeAheadSql* = `SELECT ... AS 'id', ... AS 'value' WHERE name LIKE ? OR firstName LIKE ? LIMIT 100`
* If there is only one column in the SELECT statement, that one will be used and there is no dict (key/value pair). * If there is only one column in the SELECT statement, that one will be used and there is no dict (key/value pair).
* If there is no column `id` or no column `value`, than the first column becomes `id` and the second column becomes `value`. * If there is no column `id` or no column `value`, then the first column becomes `id` and the second column becomes `value`.
* The query will be fired as a 'prepared statement'. * The query will be fired as a 'prepared statement'.
* The value, typed by the user, will be replaced on all places where a `?` appears. * The value, typed by the user, will be replaced on all places where a `?` appears.
* All `?` will be automatically surrounded by '%'. Therefore wildcard search is implemented: `... LIKE '%<?>%' ...` * All `?` will be automatically surrounded by '%'. Therefore wildcard search is implemented: `... LIKE '%<?>%' ...`
......
...@@ -82,7 +82,7 @@ try { ...@@ -82,7 +82,7 @@ try {
// in case everything is fine, an empty string is returned. Else an Array. // in case everything is fine, an empty string is returned. Else an Array.
$flagSuccess = ($answer === ''); $flagSuccess = ($answer === '');
$targetUrl = Store::getVar(SIP_TARGET_URL, STORE_SIP); $targetUrl = str_replace('--amp--', '&', Store::getVar(SIP_TARGET_URL, STORE_SIP));
$modeAnswer = Store::getVar(SIP_MODE_ANSWER, STORE_SIP); $modeAnswer = Store::getVar(SIP_MODE_ANSWER, STORE_SIP);
switch ($modeAnswer) { switch ($modeAnswer) {
......
...@@ -919,7 +919,8 @@ class Link { ...@@ -919,7 +919,8 @@ class Link {
break; break;
case TOKEN_ACTION_DELETE_REPORT: case TOKEN_ACTION_DELETE_REPORT:
$nameUrlParam .= '&' . SIP_MODE_ANSWER . '=' . MODE_HTML; $nameUrlParam .= '&' . SIP_MODE_ANSWER . '=' . MODE_HTML;
$nameUrlParam .= '&' . SIP_TARGET_URL . '=' . $_SERVER['REQUEST_URI']; // Encode '&' in url to preserve parameters (#4545) - need to decode on use.
$nameUrlParam .= '&' . SIP_TARGET_URL . '=' . str_replace('&', '--amp--', $_SERVER['REQUEST_URI']);
break; break;
case TOKEN_ACTION_DELETE_CLOSE: case TOKEN_ACTION_DELETE_CLOSE:
// TODO: Implement for Form (primary Record wird geloescht) // TODO: Implement for Form (primary Record wird geloescht)
......
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