From d2fd5f7bcd1651d8ed91368fe66d65f948e31a0c Mon Sep 17 00:00:00 2001 From: GregM Date: Mon, 28 Mar 2022 09:56:56 +0200 Subject: [PATCH] update backtopage --- htdocs/hrm/evaluation_card.php | 4 ++-- htdocs/hrm/evaluation_list.php | 2 +- htdocs/hrm/job_card.php | 4 ++-- htdocs/hrm/job_list.php | 2 +- htdocs/hrm/position.php | 4 ++-- htdocs/hrm/position_list.php | 2 +- htdocs/hrm/skill_card.php | 4 ++-- htdocs/hrm/skill_list.php | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php index 3a9b73575d8..71d3101e1c7 100644 --- a/htdocs/hrm/evaluation_card.php +++ b/htdocs/hrm/evaluation_card.php @@ -112,8 +112,8 @@ if (empty($reshook)) { $backurlforlist = dol_buildpath('/hrm/evaluation_list.php', 1); - if (!empty($backtopage) || ($cancel && empty($id))) { - if (!empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) { + if (empty($backtopage) || ($cancel && empty($id))) { + if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) { if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) { $backtopage = $backurlforlist; } else { diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php index ad99573b096..466741153c4 100644 --- a/htdocs/hrm/evaluation_list.php +++ b/htdocs/hrm/evaluation_list.php @@ -412,7 +412,7 @@ print ''; print ''; print ''; -$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/evaluation_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd); +$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/evaluation_card.php', 1).'?action=create', '', $permissiontoadd); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); diff --git a/htdocs/hrm/job_card.php b/htdocs/hrm/job_card.php index 4bf2f7d1ac1..906eb83b945 100644 --- a/htdocs/hrm/job_card.php +++ b/htdocs/hrm/job_card.php @@ -106,8 +106,8 @@ if (empty($reshook)) { $backurlforlist = dol_buildpath('/hrm/job_list.php', 1); - if (!empty($backtopage) || ($cancel && empty($id))) { - if (!empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) { + if (empty($backtopage) || ($cancel && empty($id))) { + if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) { if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) { $backtopage = $backurlforlist; } else { diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php index 7644ea1fd0f..33f4ea46305 100644 --- a/htdocs/hrm/job_list.php +++ b/htdocs/hrm/job_list.php @@ -412,7 +412,7 @@ print ''; print ''; print ''; -$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/job_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd); +$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/job_card.php', 1).'?action=create', '', $permissiontoadd); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php index f2fc49197a7..f6ad925f211 100644 --- a/htdocs/hrm/position.php +++ b/htdocs/hrm/position.php @@ -160,8 +160,8 @@ if (empty($reshook)) { $backurlforlist = dol_buildpath('/hrm/position_list.php', 1); //$backtopage = dol_buildpath('/hrm/position.php', 1) . '?fk_job=' . ($fk_job > 0 ? $fk_job : '__ID__'); - if (!empty($backtopage) || ($cancel && $fk_job <= 0)) { - if (!empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) { + if (empty($backtopage) || ($cancel && $fk_job <= 0)) { + if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) { if ($fk_job == -1 && (($action != 'add' && $action != 'create') || $cancel)) { $backtopage = $backurlforlist; } else { diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php index 13315a2a9bc..f193783cb42 100644 --- a/htdocs/hrm/position_list.php +++ b/htdocs/hrm/position_list.php @@ -417,7 +417,7 @@ print ''; print ''; print ''; -$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd); +$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create', '', $permissiontoadd); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1); diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php index 546e4fd5acf..6cac7b4d448 100644 --- a/htdocs/hrm/skill_card.php +++ b/htdocs/hrm/skill_card.php @@ -109,8 +109,8 @@ if (empty($reshook)) { $backurlforlist = DOL_URL_ROOT.'/hrm/skill_list.php'; - if (!empty($backtopage) || ($cancel && empty($id))) { - if (!empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) { + if (empty($backtopage) || ($cancel && empty($id))) { + if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) { if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) { $backtopage = $backurlforlist; } else { diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php index 8ef800b3ffc..01a677cfe54 100644 --- a/htdocs/hrm/skill_list.php +++ b/htdocs/hrm/skill_list.php @@ -412,7 +412,7 @@ print ''; print ''; print ''; -$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/skill_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd); +$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/skill_card.php', 1).'?action=create','', $permissiontoadd); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);