From 7262f90519b7b77c8578c802307f56ad96430790 Mon Sep 17 00:00:00 2001 From: Abbes Bahfir Date: Wed, 9 Jan 2019 18:12:06 +0100 Subject: [PATCH 1/3] linl back to list if cancelled on create --- htdocs/modulebuilder/template/myobject_card.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index e37216054b4..b7e37aef62a 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -118,8 +118,11 @@ if (empty($reshook)) $error=0; $permissiontoadd = $user->rights->mymodule->write; - $permissiontodelete = $user->rights->mymodule->delete || ($permissiontoadd && $object->status == 0); - if (empty($backtopage)) $backtopage = dol_buildpath('/mymodule/myobject_card.php',1).'?id='.($id > 0 ? $id : '__ID__'); + $permissiontodelete = $user->rights->mymodule->delete; + if (empty($backtopage)) { + if (empty($id)) $backtopage = dol_buildpath('/mymodule/myobject_list.php',1); + else $backtopage = dol_buildpath('/mymodule/myobject_card.php',1).($id > 0 ? $id : '__ID__'); + } $backurlforlist = dol_buildpath('/mymodule/myobject_list.php',1); $triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record From 865b7cbe926fb6865bb079bab9ae6c5111700bec Mon Sep 17 00:00:00 2001 From: Bahfir Abbes Date: Wed, 9 Jan 2019 18:47:43 +0100 Subject: [PATCH 2/3] simplification --- htdocs/modulebuilder/template/myobject_card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php index b7e37aef62a..87996c9e0c7 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -119,11 +119,11 @@ if (empty($reshook)) $permissiontoadd = $user->rights->mymodule->write; $permissiontodelete = $user->rights->mymodule->delete; + $backurlforlist = dol_buildpath('/mymodule/myobject_list.php',1); if (empty($backtopage)) { - if (empty($id)) $backtopage = dol_buildpath('/mymodule/myobject_list.php',1); + if (empty($id)) $backtopage = $backurlforlist; else $backtopage = dol_buildpath('/mymodule/myobject_card.php',1).($id > 0 ? $id : '__ID__'); - } - $backurlforlist = dol_buildpath('/mymodule/myobject_list.php',1); + } $triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record // Actions cancel, add, update, delete or clone From 2ce5c89a1484785b9e3075907accb7fc972956cb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 16 Jan 2019 12:46:14 +0100 Subject: [PATCH 3/3] 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 87996c9e0c7..1004ebd20f8 100644 --- a/htdocs/modulebuilder/template/myobject_card.php +++ b/htdocs/modulebuilder/template/myobject_card.php @@ -118,7 +118,7 @@ if (empty($reshook)) $error=0; $permissiontoadd = $user->rights->mymodule->write; - $permissiontodelete = $user->rights->mymodule->delete; + $permissiontodelete = $user->rights->mymodule->delete || ($permissiontoadd && $object->status == 0); $backurlforlist = dol_buildpath('/mymodule/myobject_list.php',1); if (empty($backtopage)) { if (empty($id)) $backtopage = $backurlforlist;