From ef963140269ea5900c4cfa349b0ec8544cffd7ce Mon Sep 17 00:00:00 2001
From: yannis <yannishoareau26@gmail.com>
Date: Tue, 1 Jul 2025 16:52:26 +0200
Subject: [PATCH] fix: cancel button not working when comming from admin token
 list

---
 htdocs/api/admin/token_list.php | 2 +-
 htdocs/user/api_token/card.php  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/api/admin/token_list.php b/htdocs/api/admin/token_list.php
index bdcb222a33e..35965a25dc7 100644
--- a/htdocs/api/admin/token_list.php
+++ b/htdocs/api/admin/token_list.php
@@ -305,7 +305,7 @@ if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predel
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $morehtmlright = '';
-$tmpurlforbutton = DOL_URL_ROOT.'/user/api_token/card.php?action=create';
+$tmpurlforbutton = DOL_URL_ROOT.'/user/api_token/card.php?action=create&backtopage='.urlencode(DOL_URL_ROOT.'/api/admin/token_list.php');
 $morehtmlright .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', $tmpurlforbutton);
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id=">'."\n";
diff --git a/htdocs/user/api_token/card.php b/htdocs/user/api_token/card.php
index 69cd6e8932a..1243aefb0a3 100644
--- a/htdocs/user/api_token/card.php
+++ b/htdocs/user/api_token/card.php
@@ -110,6 +110,10 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	if (empty($backtopage)) {
+		$backtopage = 'list.php?id='.$object->id;
+	}
+
 	if ($cancel) {
 		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
@@ -361,7 +365,7 @@ if ($action == 'create') {
 	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="list.php?id='.$object->id.'">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 	print dol_get_fiche_head();