Tpl::display_ajax_return(): add $keep_messages_on_success parameter
This commit is contained in:
parent
44fc339057
commit
27866d7e4f
1 changed files with 22 additions and 9 deletions
19
src/Tpl.php
19
src/Tpl.php
|
@ -535,11 +535,17 @@ class Tpl {
|
|||
* Display AJAX return
|
||||
* @param array|null $data AJAX returned data (optional)
|
||||
* @param int|null $error_code HTTP error code (optional, default: 400 if not $data['success'])
|
||||
* @param bool $pretty AJAX returned data
|
||||
* @param bool|null $pretty AJAX returned data
|
||||
* (optional, default: true if $_REQUEST['pretty'] is set, False otherwise)
|
||||
* @param bool $keep_messages_on_success If true and the return is a success, errors & messages
|
||||
* will be keep in session and will not be included in this
|
||||
* Ajax return (useful if you want to trigger redirect on
|
||||
* success)
|
||||
* @return never
|
||||
*/
|
||||
public static function display_ajax_return($data=null, $error_code=null, $pretty=false) {
|
||||
public static function display_ajax_return(
|
||||
$data=null, $error_code=null, $pretty=null, $keep_messages_on_success=false
|
||||
) {
|
||||
if (!is_array($data))
|
||||
$data = array();
|
||||
|
||||
|
@ -550,6 +556,7 @@ class Tpl {
|
|||
)
|
||||
http_response_code($error_code ? $error_code : 400);
|
||||
|
||||
if (($data['success'] ?? false) && !$keep_messages_on_success) {
|
||||
$data['messages'] = self :: get_messages();
|
||||
if (!$data['messages']) unset($data['messages']);
|
||||
self :: purge_messages();
|
||||
|
@ -557,11 +564,17 @@ class Tpl {
|
|||
$data['errors'] = self :: get_errors();
|
||||
if (!$data['errors']) unset($data['errors']);
|
||||
self :: purge_errors();
|
||||
}
|
||||
|
||||
if (self :: $_debug_ajax)
|
||||
Log :: debug("AJAX Response : ".vardump($data));
|
||||
header('Content-Type: application/json');
|
||||
echo json_encode($data, (($pretty||isset($_REQUEST['pretty']))?JSON_PRETTY_PRINT:0));
|
||||
echo json_encode(
|
||||
$data,
|
||||
($pretty ?? false) || isset($_REQUEST['pretty'])?
|
||||
JSON_PRETTY_PRINT:
|
||||
0
|
||||
);
|
||||
exit();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue