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

NEW Holiday is a RH module. All RH module provides by default visilibity

Browse Source 
on users of its hierarchy.
This commit is contained in:
Laurent Destailleur 2016-03-14 21:22:49 +01:00
parent 12bb3932d0
commit d4c6c4c140
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/menus/standard/eldy.lib.php
View File

@ -1220,7 +1220,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add("/holiday/card.php?&action=request", $langs->trans("New"), 1,$user->rights->holiday->write); $newmenu->add("/holiday/card.php?&action=request", $langs->trans("New"), 1,$user->rights->holiday->write);
$newmenu->add("/holiday/list.php?&leftmenu=hrm", $langs->trans("List"), 1,$user->rights->holiday->read); $newmenu->add("/holiday/list.php?&leftmenu=hrm", $langs->trans("List"), 1,$user->rights->holiday->read);
$newmenu->add("/holiday/list.php?select_statut=2&leftmenu=hrm", $langs->trans("ListToApprove"), 2, $user->rights->holiday->read); $newmenu->add("/holiday/list.php?select_statut=2&leftmenu=hrm", $langs->trans("ListToApprove"), 2, $user->rights->holiday->read);
$newmenu->add("/holiday/define_holiday.php?&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->define_holiday); $newmenu->add("/holiday/define_holiday.php?&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);
$newmenu->add("/holiday/view_log.php?&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday); $newmenu->add("/holiday/view_log.php?&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);
} }

18
htdocs/holiday/define_holiday.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2007-2015 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2007-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com> * Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com>
* Copyright (C) 2013 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2013 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2016 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2016 Regis Houssin <regis.houssin@capnetworks.com>
@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
if ($user->societe_id > 0) accessforbidden(); if ($user->societe_id > 0) accessforbidden();
// If the user does not have perm to read the page // If the user does not have perm to read the page
if(!$user->rights->holiday->define_holiday) accessforbidden(); if(!$user->rights->holiday->read) accessforbidden();
$action=GETPOST('action'); $action=GETPOST('action');
@ -235,11 +235,23 @@ else
print '<td></td>'; print '<td></td>';
print '</tr>'; print '</tr>';
// Get array of ids of all childs
$userchilds=array();
if (empty($user->rights->holiday->define_holiday))
{
$userchilds=$user->getAllChildIds();
}
foreach($listUsers as $users) foreach($listUsers as $users)
{ {
$var=!$var; $var=!$var;
// If user has not permission to edit/read all, we must see only subordinates
if (empty($user->rights->holiday->define_holiday))
{
if (($users['rowid'] != $user->id) && (! in_array($users['rowid'], $userchilds))) continue; // This user is not into hierarchy of current user, we hide it.
}
print '<tr '.$bc[$var].' style="height: 20px;">'; print '<tr '.$bc[$var].' style="height: 20px;">';
print '<td>'; print '<td>';
$userstatic->id=$users['rowid']; $userstatic->id=$users['rowid'];

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

@ -2575,7 +2575,8 @@ class User extends CommonObject
} }
/** /**
* For user id_user and its childs available in this->users, define property fullpath and fullname * For user id_user and its childs available in this->users, define property fullpath and fullname.
* Function called by get_full_tree().
* *
* @param int $id_user id_user entry to update * @param int $id_user id_user entry to update
* @param int $protection Deep counter to avoid infinite loop * @param int $protection Deep counter to avoid infinite loop