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

Fixe: La liste des droits d'un user affiche d'abord le module puis les droits.

Browse Source
This commit is contained in:
Laurent Destailleur 2004-12-22 21:29:33 +00:00
parent 3e39d3e483
commit 9c658d4e1e
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/user/fiche.php
View File

@ -390,7 +390,7 @@ else
if ($user->id <> $_GET["id"] && $user->admin) if ($user->id <> $_GET["id"] && $user->admin)
{ {
print '<a class="tabAction" href="fiche.php?action=delete&amp;id='.$fuser->id.'">'.$langs->trans("DisableUser").'</a>'; print '<a class="butDelete" href="fiche.php?action=delete&amp;id='.$fuser->id.'">'.$langs->trans("DisableUser").'</a>';
} }
print "</div>\n"; print "</div>\n";
@ -401,8 +401,8 @@ else
* Droits * Droits
*/ */
print '<table width="100%" class="noborder">'; print '<table width="100%" class="noborder">';
print '<tr class="liste_titre"><td>'.$langs->trans("Permissions").'</td><td>'.$langs->trans("Module").'</td></tr>'; print '<tr class="liste_titre"><td>'.$langs->trans("Module").'</td><td>'.$langs->trans("Permissions").'</td></tr>';
$sql = "SELECT r.libelle, r.module, r.perms FROM ".MAIN_DB_PREFIX."rights_def as r, ".MAIN_DB_PREFIX."user_rights as ur"; $sql = "SELECT r.libelle, r.module, r.perms, r.subperms FROM ".MAIN_DB_PREFIX."rights_def as r, ".MAIN_DB_PREFIX."user_rights as ur";
$sql .= " WHERE ur.fk_id = r.id AND ur.fk_user = ".$fuser->id. " ORDER BY r.module, r.id ASC"; $sql .= " WHERE ur.fk_id = r.id AND ur.fk_user = ".$fuser->id. " ORDER BY r.module, r.id ASC";
$var = True; $var = True;
if ($db->query($sql)) if ($db->query($sql))
@ -410,18 +410,27 @@ else
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($i); $obj = $db->fetch_object($i);
if ($oldmod <> $obj->module) if ($oldmod <> $obj->module)
{ {
$oldmod = $obj->module; $oldmod = $obj->module;
$var = !$var; $var = !$var;
} }
print '<tr '. $bc[$var].'>'; if (! $obj->perms) {
print '<td>'.$obj->libelle . '</td><td>'.$obj->module . '</td>'; // Si droit selon modèle simple
print '</tr>'; print "<tr $bc[$var]><td>".$obj->module."</td><td>".$obj->libelle . "</td></tr>\n";
} else {
// Si droit selon nouveau modèle (avec sous niveaux de droits)
//$alpha = "user->rights->".$obj->perms."->".$obj->subperms;
//print "$alpha ".$$alpha;
//if ($$alpha)
//{
print "<tr $bc[$var]><td>".$obj->module."</td><td>".$obj->perms." - ".$obj->subperms."</td></tr>\n";
//}
}
$i++; $i++;
} }
} }
print "</table>\n"; print "</table>\n";
print "<br>\n"; print "<br>\n";