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

Fix loose filter

Browse Source
This commit is contained in:
Laurent Destailleur 2017-10-09 18:51:33 +02:00
parent 19de053054
commit dce71d6e7d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/projet/activity/perday.php
View File

@ -493,7 +493,7 @@ if (count($tasksarray) > 0)
}
else
{
print '<tr><td colspan="13">'.$langs->trans("NoTasks").'</td></tr>';
print '<tr><td colspan="14">'.$langs->trans("NoTasks").'</td></tr>';
}
print "</table>";
print '</div>';

13
htdocs/projet/activity/perweek.php
View File

@ -283,8 +283,17 @@ if ($action == 'addtime' && $user->rights->projet->lire)
{
setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
$param='';
$param.=($mode?'&mode='.$mode:'');
$param.=($projectid?'id='.$projectid:'').($search_usertoprocessid?'&search_usertoprocessid='.$search_usertoprocessid:'').($day?'&day='.$day:'').($month?'&month='.$month:'').($year?'&year='.$year:'');
$param.=($search_project_ref?'&search_project_ref='.$search_project_ref:'');
$param.=($search_usertoprocessid > 0?'&search_usertoprocessid='.$search_usertoprocessid:'');
$param.=($search_thirdparty?'&search_thirdparty='.$search_thirdparty:'');
$param.=($search_task_ref?'&search_task_ref='.$search_task_ref:'');
$param.=($search_task_label?'&search_task_label='.$search_task_label:'');
// Redirect to avoid submit twice on back
header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid?'id='.$projectid:'').($search_usertoprocessid?'&search_usertoprocessid='.$search_usertoprocessid:'').($mode?'&mode='.$mode:'').($day?'&day='.$day:'').($month?'&month='.$month:'').($year?'&year='.$year:''));
header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
exit;
}
}
@ -511,7 +520,7 @@ if (count($tasksarray) > 0)
}
else
{
print '<tr><td colspan="15">'.$langs->trans("NoTasks").'</td></tr>';
print '<tr><td colspan="16">'.$langs->trans("NoTasks").'</td></tr>';
}
print "</table>";
print '</div>';