Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new_no_default_rights' of

Browse Source 
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights

Conflicts:
	htdocs/langs/en_US/admin.lang
This commit is contained in:
Laurent Destailleur
2016-09-30 13:04:14 +02:00
parent 94dbe3da3f 3718121cee
commit 287f9972a8
47 changed files with 77 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/usergroups.lib.php
View File

@@ -62,7 +62,7 @@ function user_prepare_head($object)
if ($canreadperms)
{
$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
$head[$h][1] = $langs->trans("UserRights");
$head[$h][1] = $langs->trans("UserRights"). ' <span class="badge">'.($object->nb_rights).'</span>';
$head[$h][2] = 'rights';
$h++;
}