lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX counter of permissions in badge was wrong

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-19 16:30:40 +01:00
parent e4e085e332
commit 3c1d7bfbf0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/user/class/user.class.php
View File

@ -749,6 +749,7 @@ class User extends CommonObject
{ {
dol_syslog(get_class($this)."::clearrights reset user->rights"); dol_syslog(get_class($this)."::clearrights reset user->rights");
$this->rights=''; $this->rights='';
$this->nb_rights=0;
$this->all_permissions_are_loaded=false; $this->all_permissions_are_loaded=false;
$this->_tab_loaded=array(); $this->_tab_loaded=array();
} }

10
htdocs/user/perms.php
View File

@ -97,6 +97,9 @@ if (empty($reshook)) {
$user->getrights(); $user->getrights();
$menumanager->loadMenu(); $menumanager->loadMenu();
} }
$object->clearrights();
$object->getrights();
} }
if ($action == 'delrights' && $caneditperms) { if ($action == 'delrights' && $caneditperms) {
@ -110,6 +113,9 @@ if (empty($reshook)) {
$user->getrights(); $user->getrights();
$menumanager->loadMenu(); $menumanager->loadMenu();
} }
$object->clearrights();
$object->getrights();
} }
} }
@ -266,9 +272,9 @@ if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->ad
if ($caneditperms) if ($caneditperms)
{ {
print '<td align="center" class="nowrap">'; print '<td align="center" class="nowrap">';
print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("All")."</a>"; print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("All")."</a>";
print '/'; print '/';
print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("None")."</a>"; print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("None")."</a>";
print '</td>'; print '</td>';
} }
print '<td align="center" width="24">&nbsp;</td>'; print '<td align="center" width="24">&nbsp;</td>';