Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX #yogosha23096

Browse Source
This commit is contained in:
Laurent Destailleur 2024-07-02 12:20:12 +02:00
parent 12f53a8481
commit e0094bc8d4
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
htdocs/holiday/define_holiday.php
View File

@ -72,8 +72,23 @@ $extrafields = new ExtraFields($db);
$holiday = new Holiday($db);
$arrayfields = array(
'cp.rowid' => array('label' => $langs->trans("Employee"), 'checked' => 1, 'position' => 20),
'cp.fk_user' => array('label' => $langs->trans("Supervisor"), 'checked' => 1, 'position' => 30),
'cp.nbHoliday' => array('label' => $langs->trans("MenuConfCP"), 'checked' => 1, 'position' => 40),
'cp.note_public' => array('label' => $langs->trans("Note"), 'checked' => 1, 'position' => 50),
);
if (empty($conf->holiday->enabled)) {
$permissiontoread = $user->hasRight('holiday', 'read');
$permissiontoreadall = $user->hasRight('holiday', 'readall');
$permissiontowrite = $user->hasRight('holiday', 'write');
$permissiontowriteall = $user->hasRight('holiday', 'writeall');
$permissiontodelete = $user->hasRight('holiday', 'delete');
$permissiontoapprove = $user->hasRight('holiday', 'approve');
$permissiontosetup = $user->hasRight('holiday', 'define_holiday');
if (!isModEnabled('holiday')) {
accessforbidden('Module not enabled');
}
@ -87,13 +102,6 @@ if (!$user->hasRight('holiday', 'read')) {
accessforbidden();
}
$arrayfields = array(
'cp.rowid' => array('label' => $langs->trans("Employee"), 'checked' => 1, 'position' => 20),
'cp.fk_user' => array('label' => $langs->trans("Supervisor"), 'checked' => 1, 'position' => 30),
'cp.nbHoliday' => array('label' => $langs->trans("MenuConfCP"), 'checked' => 1, 'position' => 40),
'cp.note_public' => array('label' => $langs->trans("Note"), 'checked' => 1, 'position' => 50),
);
/*
* Actions
@ -128,14 +136,11 @@ if (empty($reshook)) {
// Mass actions
$objectclass = 'Holiday';
$objectlabel = 'Holiday';
$permissiontoread = $user->hasRight('holiday', 'read');
$permissiontodelete = $user->hasRight('holiday', 'delete');
$permissiontoapprove = $user->hasRight('holiday', 'approve');
$uploaddir = $conf->holiday->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
// If there is an update action
if ($action == 'update' && GETPOSTISSET('update_cp')) {
if ($action == 'update' && GETPOSTISSET('update_cp') && $permissiontosetup) {
$error = 0;
$nbok = 0;
@ -233,7 +238,7 @@ $arrayofmassactions = array(
//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
);
if ($user->hasRight("holiday", "approve")) {
if ($permissiontosetup) {
$arrayofmassactions['preincreaseholiday'] = img_picto('', 'add', 'class="pictofixedwidth"').$langs->trans("IncreaseHolidays");
}
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@ -294,7 +299,7 @@ $filters = '';
// Filter on array of ids of all children
$userchilds = array();
if (!$user->hasRight('holiday', 'readall')) {
if (!$permissiontoreadall) {
$userchilds = $user->getAllChildIds(1);
$filters .= ' AND u.rowid IN ('.$db->sanitize(implode(', ', $userchilds)).')';
}
@ -322,7 +327,7 @@ if (count($typeleaves) == 0) {
//print '</div>';
} else {
$canedit = 0;
if ($user->hasRight('holiday', 'define_holiday')) {
if ($permissiontosetup) {
$canedit = 1;
}
@ -407,7 +412,7 @@ if (count($typeleaves) == 0) {
}
}
if (!empty($arrayfields['cp.note_public']['checked'])) {
print_liste_field_titre((!$user->hasRight('holiday', 'define_holiday') ? '' : 'Note'), $_SERVER["PHP_SELF"]);
print_liste_field_titre($permissiontosetup ? 'Note' : '', $_SERVER["PHP_SELF"]);
}
print_liste_field_titre('');
// Action column
@ -421,7 +426,7 @@ if (count($typeleaves) == 0) {
$arrayofselected = is_array($toselect) ? $toselect : array();
// If user has not permission to edit/read all, we must see only subordinates
if (!$user->hasRight('holiday', 'readall')) {
if (!$permissiontoreadall) {
if (($users['rowid'] != $user->id) && (!in_array($users['rowid'], $userchilds))) {
continue; // This user is not into hierarchy of current user, we hide it.
}
@ -506,7 +511,7 @@ if (count($typeleaves) == 0) {
// Button modify
print '<td class="center">';
if ($user->hasRight('holiday', 'define_holiday')) { // Allowed to set the balance of any user
if ($permissiontosetup) { // Allowed to set the balance of any user
print '<input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Save")).'" class="button smallpaddingimp"/>';
}
print '</td>'."\n";

2
htdocs/holiday/view_log.php
View File

@ -89,7 +89,7 @@ $hookmanager->initHooks(array('leavemovementlist')); // Note that conf->hooks_mo
$arrayfields = array();
$arrayofmassactions = array();
if (empty($conf->holiday->enabled)) {
if (!isModEnabled('holiday')) {
accessforbidden('Module not enabled');
}