diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 8b375007646..4516991232b 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -31,17 +31,24 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -$search_project_user = GETPOSTINT('search_project_user'); -$mine = GETPOST('mode', 'aZ09') == 'mine' ? 1 : 0; -if ($search_project_user == $user->id) { - $mine = 1; -} +// Load translation files required by the page +$langs->loadLangs(array('projects', 'companies')); $hookmanager = new HookManager($db); // Initialize a technical object to manage hooks. Note that conf->hooks_modules contains array $hookmanager->initHooks(array('activityindex')); +$action = GETPOST('action', 'aZ09'); +$search_project_user = GETPOST('search_project_user'); +$mine = (GETPOST('mode', 'aZ09') == 'mine' || $search_project_user == $user->id) ? 1 : 0; +if ($mine == 0 && $search_project_user === '') { + $search_project_user = getDolGlobalString('MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX'); +} +if ($search_project_user == $user->id) { + $mine = 1; +} + // Security check $socid = 0; if ($user->socid > 0) { @@ -52,8 +59,25 @@ if (!$user->hasRight('projet', 'lire')) { accessforbidden(); } -// Load translation files required by the page -$langs->load("projects"); + +/* + * Actions + */ + +$parameters = array(); +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) { + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); +} +if (empty($reshook)) { + if ($action == 'refresh_search_project_user') { + $search_project_user = GETPOSTINT('search_project_user'); + $tabparam = array("MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX" => $search_project_user); + + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + $result = dol_set_user_param($db, $conf, $user, $tabparam); + } +} /* @@ -66,6 +90,7 @@ $day = $tmp['mday']; $month = $tmp['mon']; $year = $tmp['year']; +$form = new Form($db); $projectstatic = new Project($db); $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1); // Return all projects I have permission on because I want my tasks and some of my task may be on a public projet that is not my project $taskstatic = new Task($db); @@ -87,9 +112,12 @@ if ($user->hasRight('projet', 'all', 'lire') && !$socid) { $morehtml = ''; -$morehtml .= '