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

FIX Edit of a time spent line

Browse Source
This commit is contained in:
Laurent Destailleur 2020-06-18 14:09:43 +02:00
parent ade542eee7
commit c986ab95cf
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/projet/tasks/time.php
View File

@ -215,11 +215,11 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
} }
} }
if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel"] && $user->rights->projet->lire) if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $user->rights->projet->lire)
{ {
$error = 0; $error = 0;
if (empty($_POST["new_durationhour"]) && empty($_POST["new_durationmin"])) if (!GETPOST("new_durationhour") && !GETPOST("new_durationmin"))
{ {
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Duration")), null, 'errors'); setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Duration")), null, 'errors');
$error++; $error++;
@ -227,9 +227,9 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$_POST["cancel
if (!$error) if (!$error)
{ {
if ($_POST['taskid'] != $id) if (GETPOST('taskid', 'int') != $id) // GETPOST('taskid') is id of new task
{ {
$id = $_POST['taskid']; $id = GETPOST('taskid', 'int');
$object->fetchTimeSpent(GETPOST('lineid', 'int')); $object->fetchTimeSpent(GETPOST('lineid', 'int'));
// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids)) // TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
@ -1363,6 +1363,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
print '</td>'; print '</td>';
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
} }
} else {
print '<input type="hidden" name="taskid" value="'.$id.'">';
} }
// Task label // Task label