From e95d93e6313fb642e6ab1762e2cda4245f20ee20 Mon Sep 17 00:00:00 2001 From: Abbes Bahfir Date: Fri, 19 Oct 2018 17:31:26 +0100 Subject: [PATCH 1/4] fix:follow url back link --- htdocs/categories/viewcat.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index ba3580cea87..3bb309814b3 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -197,8 +197,7 @@ $head = categories_prepare_head($object,$type); dol_fiche_head($head, 'card', $title, -1, 'category'); - -$linkback = ''.$langs->trans("BackToList").''; +$linkback=(GETPOST('linkback') ? GETPOST('linkback'): ''.$langs->trans("BackToList").''); $object->next_prev_filter=" type = ".$object->type; $object->ref = $object->label; $morehtmlref='
'.$langs->trans("Root").' >> '; From 1b60fb7702a5f4e13925116a3269dfb7e3b07185 Mon Sep 17 00:00:00 2001 From: Bahfir Abbes Date: Fri, 19 Oct 2018 18:00:24 +0100 Subject: [PATCH 2/4] Update viewcat.php --- htdocs/categories/viewcat.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 3bb309814b3..a71fa14ebdd 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -197,7 +197,8 @@ $head = categories_prepare_head($object,$type); dol_fiche_head($head, 'card', $title, -1, 'category'); -$linkback=(GETPOST('linkback') ? GETPOST('linkback'): ''.$langs->trans("BackToList").''); +$linkback=(GETPOST('linkback') ? GETPOST('linkback'):DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type); +$linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter=" type = ".$object->type; $object->ref = $object->label; $morehtmlref='
'.$langs->trans("Root").' >> '; From 0f5bf891e2916ac74a7ab85dec94ef812c134195 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Dec 2019 12:29:16 +0100 Subject: [PATCH 3/4] Update viewcat.php --- htdocs/categories/viewcat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index a71fa14ebdd..895147175de 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -197,7 +197,7 @@ $head = categories_prepare_head($object,$type); dol_fiche_head($head, 'card', $title, -1, 'category'); -$linkback=(GETPOST('linkback') ? GETPOST('linkback'):DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type); +$linkback=(GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type); $linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter=" type = ".$object->type; $object->ref = $object->label; From 5012a66ecb6303de583490fd22ef7741e30e6268 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Dec 2019 12:29:52 +0100 Subject: [PATCH 4/4] Update viewcat.php --- htdocs/categories/viewcat.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 895147175de..95760ee87aa 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -197,8 +197,8 @@ $head = categories_prepare_head($object,$type); dol_fiche_head($head, 'card', $title, -1, 'category'); -$linkback=(GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type); -$linkback = ''.$langs->trans("BackToList").''; +$backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type); +$linkback = ''.$langs->trans("BackToList").''; $object->next_prev_filter=" type = ".$object->type; $object->ref = $object->label; $morehtmlref='