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

New: Task #10725

Browse Source
This commit is contained in:
Regis Houssin 2010-10-29 05:38:33 +00:00
parent 40cdb5dba1
commit 9ad9d7c493
4 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/includes/modules/modUser.class.php
View File

@ -127,6 +127,14 @@ class modUser extends DolibarrModules
$r++;
$this->rights[$r][0] = 256;
$this->rights[$r][1] = 'Consulter ses propres permissions';
$this->rights[$r][2] = 'r';
$this->rights[$r][3] = 1;
$this->rights[$r][4] = 'self';
$this->rights[$r][5] = 'readperms';
$r++;
$this->rights[$r][0] = 257;
$this->rights[$r][1] = 'Creer/modifier ses propres infos utilisateur';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 1;
@ -134,7 +142,7 @@ class modUser extends DolibarrModules
$this->rights[$r][5] = 'creer';
$r++;
$this->rights[$r][0] = 257;
$this->rights[$r][0] = 258;
$this->rights[$r][1] = 'Modifier son propre mot de passe';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 1;
@ -142,7 +150,7 @@ class modUser extends DolibarrModules
$this->rights[$r][5] = 'password';
$r++;
$this->rights[$r][0] = 258;
$this->rights[$r][0] = 259;
$this->rights[$r][1] = 'Modifier ses propres permissions';
$this->rights[$r][2] = 'w';
$this->rights[$r][3] = 1;

7
htdocs/langs/en_US/admin.lang
View File

@ -517,9 +517,10 @@ Permission252=Read permissions of other users
Permission253=Create/modify other users and permissions
Permission254=Modify other users password
Permission255=Delete or disable other users
Permission256=Create/modify his own user information
Permission257=Modify his own password
Permission258=Modify its own permissions
Permission256=Read its own permissions
Permission257=Create/modify his own user information
Permission258=Modify his own password
Permission259=Modify its own permissions
Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
Permission271=Read CA
Permission272=Read invoices

7
htdocs/langs/fr_FR/admin.lang
View File

@ -519,9 +519,10 @@ Permission252= Consulter les permissions des autres utilisateurs
Permission253= Créer/modifier les autres utilisateurs et leurs permissions
Permission254= Modifier le mot de passe des autres utilisateurs
Permission255= Supprimer ou désactiver les autres utilisateurs
Permission256= Créer/modifier ses propres infos utilisateur
Permission257= Modifier son propre mot de passe
Permission258= Modifier ses propres permissions
Permission256= Consulter ses propres permissions
Permission257= Créer/modifier ses propres infos utilisateur
Permission258= Modifier son propre mot de passe
Permission259= Modifier ses propres permissions
Permission262= Étendre l'accès à tous les tiers (Pas seulement ceux liés à l'utilisateur). Non effectif pour utilisateurs externes (toujours limité à eux-même).
Permission271= Consulter le CA
Permission272= Consulter les factures

35
htdocs/lib/usergroups.lib.php
View File

@ -26,8 +26,11 @@
*/
function user_prepare_head($object)
{
global $langs, $conf;
global $langs, $conf, $user;
$langs->load("users");
$canreadperms=($user->admin || ($user->id != $object->id && $user->user->user->readperms) || ($user->id == $object->id && $user->user->self->readperms));
$h = 0;
$head = array();
@ -45,11 +48,14 @@ function user_prepare_head($object)
$head[$h][2] = 'ldap';
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
$head[$h][1] = $langs->trans("UserRights");
$head[$h][2] = 'rights';
$h++;
if ($canreadperms)
{
$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
$head[$h][1] = $langs->trans("UserRights");
$head[$h][2] = 'rights';
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/user/param_ihm.php?id='.$object->id;
$head[$h][1] = $langs->trans("UserGUISetup");
@ -97,7 +103,9 @@ function user_prepare_head($object)
function group_prepare_head($object)
{
global $langs, $conf;
global $langs, $conf, $user;
$canreadperms=($user->admin || $user->user->group->readperms);
$h = 0;
$head = array();
@ -115,11 +123,14 @@ function group_prepare_head($object)
$head[$h][2] = 'ldap';
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/user/group/perms.php?id='.$object->id;
$head[$h][1] = $langs->trans("GroupRights");
$head[$h][2] = 'rights';
$h++;
if ($canreadperms)
{
$head[$h][0] = DOL_URL_ROOT.'/user/group/perms.php?id='.$object->id;
$head[$h][1] = $langs->trans("GroupRights");
$head[$h][2] = 'rights';
$h++;
}
// Show more tabs from modules
// Entries must be declared in modules descriptor with line