From 2a265e9de9b497d33a21ec98c1d8873333f1ac69 Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio Date: Wed, 11 Apr 2018 12:32:55 +0200 Subject: [PATCH 1/4] NEW: default add action: new param $backurlforcard to redict to card --- htdocs/core/actions_addupdatedelete.inc.php | 3 ++- htdocs/modulebuilder/template/myobject_card.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php index b8ede4d7d14..5234e4c4911 100644 --- a/htdocs/core/actions_addupdatedelete.inc.php +++ b/htdocs/core/actions_addupdatedelete.inc.php @@ -26,6 +26,7 @@ // $object must be defined // $permissiontoadd must be defined // $permissiontodelete must be defined +// $backurlforcard must be defined // $backurlforlist must be defined // $backtopage may be defined @@ -66,7 +67,7 @@ if ($action == 'add' && ! empty($permissiontoadd)) if ($result > 0) { // Creation OK - $urltogo=$backtopage?$backtopage:$backurlforlist; + $urltogo=$backtopage?$backtopage:($backurlforcard?str_replace('__ID__', $result, $backurlforcard):$backurlforlist); header("Location: ".$urltogo); exit; } diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index 73c1b23f938..e9e7a3136bd 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -118,6 +118,7 @@ if (empty($reshook)) $permissiontoadd = $user->rights->mymodule->write; $permissiontodelete = $user->rights->mymodule->delete; + $backurlforcard = dol_buildpath('/mymodule/myobject_card.php',1).'?id=__ID__'; $backurlforlist = dol_buildpath('/mymodule/myobject_list.php',1); // Actions cancel, add, update or delete From 1a9675e410b6a4f239ec471904578172ea513956 Mon Sep 17 00:00:00 2001 From: Marc de Lima Lucio Date: Wed, 18 Apr 2018 10:12:19 +0200 Subject: [PATCH 2/4] FIX: user $backtopage insteead of $backurlforcard --- htdocs/core/actions_addupdatedelete.inc.php | 2 +- htdocs/modulebuilder/template/myobject_card.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php index 5234e4c4911..e44be848179 100644 --- a/htdocs/core/actions_addupdatedelete.inc.php +++ b/htdocs/core/actions_addupdatedelete.inc.php @@ -67,7 +67,7 @@ if ($action == 'add' && ! empty($permissiontoadd)) if ($result > 0) { // Creation OK - $urltogo=$backtopage?$backtopage:($backurlforcard?str_replace('__ID__', $result, $backurlforcard):$backurlforlist); + $urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist; header("Location: ".$urltogo); exit; } diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index e9e7a3136bd..764302a8bbc 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -118,7 +118,7 @@ if (empty($reshook)) $permissiontoadd = $user->rights->mymodule->write; $permissiontodelete = $user->rights->mymodule->delete; - $backurlforcard = dol_buildpath('/mymodule/myobject_card.php',1).'?id=__ID__'; + if(empty($backtopage)) $backtopage = dol_buildpath('/mymodule/myobject_card.php',1).'?id=__ID__'; $backurlforlist = dol_buildpath('/mymodule/myobject_list.php',1); // Actions cancel, add, update or delete From e88c67ab11dbcc28eafca745ab888460247f1998 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Apr 2018 11:52:10 +0200 Subject: [PATCH 3/4] Update actions_addupdatedelete.inc.php --- htdocs/core/actions_addupdatedelete.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php index e44be848179..608927bba12 100644 --- a/htdocs/core/actions_addupdatedelete.inc.php +++ b/htdocs/core/actions_addupdatedelete.inc.php @@ -26,7 +26,6 @@ // $object must be defined // $permissiontoadd must be defined // $permissiontodelete must be defined -// $backurlforcard must be defined // $backurlforlist must be defined // $backtopage may be defined From fef5a2487081113e8875d2bb156919ec0798c5ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Apr 2018 11:52:40 +0200 Subject: [PATCH 4/4] Update myobject_card.php --- htdocs/modulebuilder/template/myobject_card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index 764302a8bbc..536226d9f31 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -118,7 +118,7 @@ if (empty($reshook)) $permissiontoadd = $user->rights->mymodule->write; $permissiontodelete = $user->rights->mymodule->delete; - if(empty($backtopage)) $backtopage = dol_buildpath('/mymodule/myobject_card.php',1).'?id=__ID__'; + if (empty($backtopage)) $backtopage = dol_buildpath('/mymodule/myobject_card.php',1).'?id=__ID__'; $backurlforlist = dol_buildpath('/mymodule/myobject_list.php',1); // Actions cancel, add, update or delete