Skip to content
Snippets Groups Projects
Commit 4ac99477 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: project info are not lost when submiting actions on tasks

parent a15ab9c4
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/projet/tasks/contact.php
+ 8
− 5
View file @ 4ac99477
......@@ -66,7 +66,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
if ($result >= 0)
{
Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject?'&withproject=1':''));
exit;
}
else
......@@ -104,7 +104,7 @@ if ($action == 'deleteline' && $user->rights->projet->creer)
if ($result >= 0)
{
Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject?'&withproject=1':''));
exit;
}
else
......@@ -125,7 +125,8 @@ if (! empty($project_ref) && ! empty($withproject))
}
else
{
Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode)?'':'&mode='.$mode));
Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':'').(empty($mode)?'':'&mode='.$mode));
exit;
}
}
}
......@@ -282,6 +283,7 @@ if ($id > 0 || ! empty($ref))
print '<input type="hidden" name="action" value="addcontact">';
print '<input type="hidden" name="source" value="internal">';
print '<input type="hidden" name="id" value="'.$id.'">';
print '<input type="hidden" name="withproject" value="'.$withproject.'">';
// Ligne ajout pour contact interne
print "<tr $bc[$var]>";
......@@ -418,7 +420,7 @@ if ($id > 0 || ! empty($ref))
// Statut
print '<td align="center">';
// Activation desativation du contact
if ($object->statut >= 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">';
if ($object->statut >= 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=swapstatut&ligne='.$tab[$i]['rowid'].($withproject?'&withproject=1':'').'">';
print $contactstatic->LibStatut($tab[$i]['status'],3);
if ($object->statut >= 0) print '</a>';
print '</td>';
......@@ -428,7 +430,7 @@ if ($id > 0 || ! empty($ref))
if ($user->rights->projet->creer)
{
print '&nbsp;';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$tab[$i]['rowid'].'">';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&lineid='.$tab[$i]['rowid'].($withproject?'&withproject=1':'').'">';
print img_delete();
print '</a>';
}
......@@ -449,5 +451,6 @@ if ($id > 0 || ! empty($ref))
llxFooter();
$db->close();
?>
htdocs/projet/tasks/document.php
+ 35
− 33
View file @ 4ac99477
......@@ -135,7 +135,8 @@ if (! empty($project_ref) && ! empty($withproject))
}
else
{
Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode)?'':'&mode='.$mode));
Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':'').(empty($mode)?'':'&mode='.$mode));
exit;
}
}
}
......@@ -265,7 +266,7 @@ if ($object->id > 0)
// Affiche formulaire upload
$formfile=new FormFile($db);
$formfile->form_attach_new_file(DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id,'',0,0,$user->rights->projet->creer);
$formfile->form_attach_new_file(DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.($withproject?'&withproject=1':''),'',0,0,$user->rights->projet->creer);
// List of document
......@@ -280,5 +281,6 @@ else
llxFooter();
$db->close();
?>
htdocs/projet/tasks/time.php
+ 7
− 4
View file @ 4ac99477
......@@ -51,6 +51,7 @@ $projectstatic = new Project($db);
/*
* Actions
*/
if ($action == 'addtimespent' && $user->rights->projet->creer)
{
$error=0;
......@@ -155,7 +156,8 @@ if (! empty($project_ref) && ! empty($withproject))
}
else
{
Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode)?'':'&mode='.$mode));
Header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':'').(empty($mode)?'':'&mode='.$mode));
exit;
}
}
}
......@@ -236,7 +238,7 @@ if ($id > 0 || ! empty($ref))
if ($action == 'deleteline')
{
$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"],$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
$ret=$form->form_confirm($_SERVER["PHP_SELF"]."?id=".$object->id.'&lineid='.$_GET["lineid"].($withproject?'&withproject=1':''),$langs->trans("DeleteATimeSpent"),$langs->trans("ConfirmDeleteATimeSpent"),"confirm_delete",'','',1);
if ($ret == 'html') print '<br>';
}
......@@ -291,6 +293,7 @@ if ($id > 0 || ! empty($ref))
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="addtimespent">';
print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<input type="hidden" name="withproject" value="'.$withproject.'">';
print '<table class="noborder" width="100%">';
......@@ -451,12 +454,12 @@ if ($id > 0 || ! empty($ref))
else if ($user->rights->projet->creer)
{
print '&nbsp;';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$task_time->rowid.'">';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
print img_edit();
print '</a>';
print '&nbsp;';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.'">';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.($withproject?'&amp;withproject=1':'').'">';
print img_delete();
print '</a>';
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment