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

Fix: Project is preselected when creating a task

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-23 19:03:53 +00:00
parent 842ae4619d
commit 84234633b7
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/core/class/html.formother.class.php
View File

@ -314,14 +314,15 @@ class FormOther
/** /**
* \brief Retourn list of project and tasks * \brief Retourn list of project and tasks
* \param selected Pre-selected value * \param selectedtask Pre-selected task
* \param projectid Project id * \param projectid Project id
* \param htmlname Name of html select * \param htmlname Name of html select
* \param modeproject 1 to restrict on projects owned by user * \param modeproject 1 to restrict on projects owned by user
* \param modetask 1 to restrict on tasks associated to user * \param modetask 1 to restrict on tasks associated to user
* \param mode 0=Return list of tasks and their projects, 1=Return projects and tasks if exists * \param mode 0=Return list of tasks and their projects, 1=Return projects and tasks if exists
* \param useempty 0=Allow empty values
*/ */
function selectProjectTasks($selected='', $projectid=0, $htmlname='task_parent', $modeproject=0, $modetask=0, $mode=0, $useempty=0) function selectProjectTasks($selectedtask='', $projectid=0, $htmlname='task_parent', $modeproject=0, $modetask=0, $mode=0, $useempty=0)
{ {
global $user, $langs; global $user, $langs;
@ -333,10 +334,10 @@ class FormOther
if ($tasksarray) if ($tasksarray)
{ {
print '<select class="flat" name="'.$htmlname.'">'; print '<select class="flat" name="'.$htmlname.'">';
if ($useempty) print '<option value="0" selected="true">&nbsp;</option>'; if ($useempty) print '<option value="0">&nbsp;</option>';
$j=0; $j=0;
$level=0; $level=0;
PLineSelect($j, 0, $tasksarray, $level, $selected); PLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid);
print '</select>'; print '</select>';
} }
else else
@ -468,7 +469,7 @@ class FormOther
* @param $level * @param $level
* @param $selected * @param $selected
*/ */
function PLineSelect(&$inc, $parent, $lines, $level=0, $selected=0) function PLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selectedproject=0)
{ {
global $langs, $user, $conf; global $langs, $user, $conf;
@ -486,7 +487,9 @@ function PLineSelect(&$inc, $parent, $lines, $level=0, $selected=0)
if ($lines[$i]->fk_project != $lastprojectid) if ($lines[$i]->fk_project != $lastprojectid)
{ {
if ($i > 0 && $conf->browser->firefox) print '<option value="0" disabled="true">----------</option>'; if ($i > 0 && $conf->browser->firefox) print '<option value="0" disabled="true">----------</option>';
print '<option value="'.$lines[$i]->fk_project.'_0">'; // Project -> Task print '<option value="'.$lines[$i]->fk_project.'_0"';
if ($selectedproject == $lines[$i]->fk_project) print ' selected="true"';
print '>'; // Project -> Task
print $langs->trans("Project").' '.$lines[$i]->projectref; print $langs->trans("Project").' '.$lines[$i]->projectref;
if (empty($lines[$i]->public)) if (empty($lines[$i]->public))
{ {
@ -508,7 +511,7 @@ function PLineSelect(&$inc, $parent, $lines, $level=0, $selected=0)
if ($lines[$i]->id > 0) if ($lines[$i]->id > 0)
{ {
print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"'; print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
if ($lines[$i]->id == $selected) print ' selected="true"'; if ($lines[$i]->id == $selectedtask) print ' selected="true"';
print '>'; print '>';
print $langs->trans("Project").' '.$lines[$i]->projectref; print $langs->trans("Project").' '.$lines[$i]->projectref;
if (empty($lines[$i]->public)) if (empty($lines[$i]->public))
@ -529,7 +532,7 @@ function PLineSelect(&$inc, $parent, $lines, $level=0, $selected=0)
} }
$level++; $level++;
if ($lines[$i]->id) PLineSelect($inc, $lines[$i]->id, $lines, $level, $selected); if ($lines[$i]->id) PLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject);
$level--; $level--;
} }
} }

2
htdocs/projet/tasks.php
View File

@ -157,7 +157,7 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer && (empty($proje
// List of projects // List of projects
print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfTask").'</td><td>'; print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfTask").'</td><td>';
print $formother->selectProjectTasks('',$projectid, 'task_parent', 0, 0, 1, 1); print $formother->selectProjectTasks('',$projectid?$projectid:$_GET["id"], 'task_parent', 0, 0, 1, 1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>'; print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';