From f15425be520ac5fbdcccc0813bfd2870a11ca9be Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 4 Nov 2015 15:45:35 +0100 Subject: [PATCH] Include the link "Back to list" on banner of all user tabs. --- htdocs/holiday/list.php | 4 +++- htdocs/user/agenda_extsites.php | 4 +++- htdocs/user/card.php | 4 +++- htdocs/user/clicktodial.php | 4 +++- htdocs/user/document.php | 4 +++- htdocs/user/info.php | 14 +++++++++----- htdocs/user/ldap.php | 4 +++- htdocs/user/note.php | 4 +++- htdocs/user/param_ihm.php | 8 ++++++-- htdocs/user/perms.php | 3 ++- 10 files changed, 38 insertions(+), 15 deletions(-) diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index b309eade0f4..09d7d165d1f 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -231,7 +231,9 @@ if ($id > 0) $title = $langs->trans("User"); dol_fiche_head($head, 'paidholidays', $title, 0, 'user'); - dol_banner_tab($fuser,'id','',$user->rights->user->user->lire || $user->admin); + $linkback = ''.$langs->trans("BackToList").''; + + dol_banner_tab($fuser,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index dc5ec528a21..1dd494cb3e8 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -153,7 +153,9 @@ $head=user_prepare_head($object); dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user'); -dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); +$linkback = ''.$langs->trans("BackToList").''; + +dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 407941c28fd..83762e988ee 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1156,7 +1156,9 @@ else { dol_fiche_head($head, 'user', $title, 0, 'user'); - dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + $linkback = ''.$langs->trans("BackToList").''; + + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index 13aaff9560f..fb3104dc285 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -91,7 +91,9 @@ if ($id > 0) $title = $langs->trans("User"); dol_fiche_head($head, 'clicktodial', $title, 0, 'user'); - dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + $linkback = ''.$langs->trans("BackToList").''; + + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; diff --git a/htdocs/user/document.php b/htdocs/user/document.php index ef4f6650818..b8152f33a85 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -129,7 +129,9 @@ if ($object->id) dol_fiche_head($head, 'document', $langs->trans("User"),0,'user'); - dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + $linkback = ''.$langs->trans("BackToList").''; + + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; diff --git a/htdocs/user/info.php b/htdocs/user/info.php index f069ac4782b..1d10875b3eb 100644 --- a/htdocs/user/info.php +++ b/htdocs/user/info.php @@ -32,7 +32,10 @@ $langs->load("users"); // Security check $id = GETPOST('id','int'); $object = new User($db); -$object->fetch($id); +if ($id > 0 || ! empty($ref)) +{ + $result = $object->fetch($id, $ref); +} // Security check $socid=0; @@ -58,17 +61,18 @@ $form = new Form($db); llxHeader(); -$object->info($id); - $head = user_prepare_head($object); $title = $langs->trans("User"); dol_fiche_head($head, 'info', $title, 0, 'user'); -$linkback = ''.$langs->trans("BackToList").''; +$linkback = ''.$langs->trans("BackToList").''; -dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', ''); +dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin); + + +$object->info($id); // This overwrite ->ref with login instead of id print '
'; diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php index 48e4f8fcbb6..968c3e565a5 100644 --- a/htdocs/user/ldap.php +++ b/htdocs/user/ldap.php @@ -93,7 +93,9 @@ $head = user_prepare_head($object); $title = $langs->trans("User"); dol_fiche_head($head, 'ldap', $title, 0, 'user'); -dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); +$linkback = ''.$langs->trans("BackToList").''; + +dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; diff --git a/htdocs/user/note.php b/htdocs/user/note.php index 7780227fb00..ccd7eb153a4 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -89,7 +89,9 @@ if ($id) $title = $langs->trans("User"); dol_fiche_head($head, 'note', $title, 0, 'user'); - dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + $linkback = ''.$langs->trans("BackToList").''; + + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 85b4ba04e84..724f2572be2 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -151,7 +151,9 @@ if ($action == 'edit') { dol_fiche_head($head, 'guisetup', $title, 0, 'user'); - dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + $linkback = ''.$langs->trans("BackToList").''; + + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; @@ -251,7 +253,9 @@ else { dol_fiche_head($head, 'guisetup', $title, 0, 'user'); - dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + $linkback = ''.$langs->trans("BackToList").''; + + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 750035e2dda..ae32a624175 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -256,8 +256,9 @@ else * Ecran ajout/suppression permission */ +$linkback = ''.$langs->trans("BackToList").''; -dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); +dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
';