'."\n\n";
--- /tmp/dsg/dolibarr/htdocs/projet/activity/github_perweek.php
+++ /tmp/dsg/dolibarr/htdocs/projet/activity/client_perweek.php
@@ -48,7 +48,8 @@
$mine = 0;
if ($mode == 'mine') $mine = 1;
-$projectid = isset($_GET["id"]) ? GETPOST("id", "int", 1) : GETPOST("projectid", "int");
+$projectid = '';
+$projectid = isset($_GET["id"]) ? $_GET["id"] : $_POST["projectid"];
$hookmanager->initHooks(array('timesheetperweekcard'));
@@ -103,12 +104,15 @@
{
$usertoprocess = $user;
$search_usertoprocessid = $usertoprocess->id;
-} elseif ($search_usertoprocessid > 0)
+}
+elseif ($search_usertoprocessid > 0)
{
$usertoprocess = new User($db);
$usertoprocess->fetch($search_usertoprocessid);
$search_usertoprocessid = $usertoprocess->id;
-} else {
+}
+else
+{
$usertoprocess = new User($db);
}
@@ -118,7 +122,8 @@
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label('projet');
+$extrafields->fetch_name_optionals_label('projet_task');
$arrayfields = array();
/*$arrayfields=array(
@@ -143,7 +148,7 @@
foreach ($extrafields->attributes['projet_task']['label'] as $key => $val)
{
if (!empty($extrafields->attributes['projet_task']['list'][$key]))
- $arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs((int) $extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
+ $arrayfields["efpt.".$key] = array('label'=>$extrafields->attributes['projet_task']['label'][$key], 'checked'=>(($extrafields->attributes['projet_task']['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes['projet_task']['pos'][$key], 'enabled'=>(abs($extrafields->attributes['projet_task']['list'][$key]) != 3 && $extrafields->attributes['projet_task']['perms'][$key]));
}
}
$arrayfields = dol_sort_array($arrayfields, 'position');
@@ -157,7 +162,6 @@
/*
* Actions
*/
-
$parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid);
$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');
@@ -173,8 +177,8 @@
$search_thirdparty = '';
$search_declared_progress = '';
- $search_array_options_project = array();
- $search_array_options_task = array();
+ $search_array_options_project = array();
+ $search_array_options_task = array();
// We redefine $usertoprocess
$usertoprocess = $user;
@@ -201,7 +205,9 @@
{
$result = $object->fetch($taskid, $ref);
if ($result < 0) $error++;
- } else {
+ }
+ else
+ {
setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
$error++;
}
@@ -238,7 +244,9 @@
$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
}
}
- } else {
+ }
+ else
+ {
dol_print_error($db);
}
}
@@ -251,7 +259,9 @@
{
$langs->load("errors");
setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
- } else {
+ }
+ else
+ {
setEventMessages($object->error, $object->errors, 'errors');
}
}
@@ -271,7 +281,9 @@
if (empty($timetoadd))
{
setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
- } else {
+ }
+ else
+ {
foreach ($timetoadd as $taskid => $value) // Loop on each task
{
$updateoftaskdone = 0;
@@ -346,21 +358,22 @@
$param .= ($search_task_ref ? '&search_task_ref='.urlencode($search_task_ref) : '');
$param .= ($search_task_label ? '&search_task_label='.urlencode($search_task_label) : '');
- /*$search_array_options=$search_array_options_project;
+ /*$search_array_options=$search_array_options_project;
$search_options_pattern='search_options_';
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
*/
- $search_array_options = $search_array_options_task;
- $search_options_pattern = 'search_task_options_';
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-
- // Redirect to avoid submit twice on back
- header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
- exit;
+ $search_array_options = $search_array_options_task;
+ $search_options_pattern = 'search_task_options_';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+ // Redirect to avoid submit twice on back
+ header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
+ exit;
}
}
}
+
/*
@@ -451,7 +464,7 @@
//$nav .= '