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

Fix can't change approver of a leave request in some cases

Browse Source
This commit is contained in:
Laurent Destailleur 2019-09-04 11:21:41 +02:00
parent cabbdfc650
commit a3d417a40f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/holiday/card.php
View File

@ -122,7 +122,7 @@ if ($action == 'create')
elseif ($starthalfday == 'afternoon') $halfday=-1;
elseif ($endhalfday == 'morning') $halfday=1;
$valideur = GETPOST('valideur');
$valideur = GETPOST('valideur', 'int');
$description = trim(GETPOST('description'));
// If no type
@ -270,8 +270,8 @@ if ($action == 'update' && ! GETPOSTISSET('savevalidator'))
// If this is the requestor or has read/write rights
if ($cancreate)
{
$valideur = $_POST['valideur'];
$description = trim($_POST['description']);
$valideur = GETPOST('valideur', 'int');
$description = trim(GETPOST('description', 'none'));
// If no start date
if (empty($_POST['date_debut_'])) {
@ -1297,7 +1297,8 @@ else
if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
else
{
$s=$form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), ($user->admin ? '' : array($user->id)), 0, $include_users);
$arrayofvalidatorstoexclude = (($user->admin || ($user->id != $userRequest->id))? '' : array($user->id)); // Nobody if we are admin or if we are not the user of the leave.
$s=$form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), $arrayofvalidatorstoexclude, 0, $include_users);
print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
}
if ($action == 'editvalidator')