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

Merge tab "tasks" and "mytasks". Now it is just a link to switch on page.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-05-22 10:20:28 +00:00
parent 8c0a14fa6d
commit 7365a16d60
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/projects.lang
View File

@ -74,6 +74,8 @@ ActionsOnProject=Actions on project
YouAreNotContactOfProject=You are not a contact of this private project YouAreNotContactOfProject=You are not a contact of this private project
DeleteATimeSpent=Delete time spent DeleteATimeSpent=Delete time spent
ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
DoNotShowMyTasksOnly=See also tasks i am not affected to
ShowMyTasksOnly=View only tasks i am affected to
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader TypeContact_project_external_PROJECTLEADER=Project leader

2
htdocs/langs/fr_FR/projects.lang
View File

@ -74,6 +74,8 @@ ActionsOnProject=Actions sur le projet
YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé
DeleteATimeSpent=Suppression du temps consommé DeleteATimeSpent=Suppression du temps consommé
ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ? ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ?
DoNotShowMyTasksOnly=Voir aussi les taches qui ne me sont pas affectées
ShowMyTasksOnly=Ne voir que les taches qui me sont affectées
##### Types de contacts ##### ##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Chef de projet TypeContact_project_internal_PROJECTLEADER=Chef de projet
TypeContact_project_external_PROJECTLEADER=Chef de projet TypeContact_project_external_PROJECTLEADER=Chef de projet

14
htdocs/lib/project.lib.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -85,12 +85,22 @@ function project_prepare_head($object)
$head[$h][2] = 'tasks'; $head[$h][2] = 'tasks';
$h++; $h++;
/* Now this is a filter in the Task tab.
$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$object->id.'&mode=mine'; $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/fiche.php?id='.$object->id.'&mode=mine';
$head[$h][1] = $langs->trans("MyTasks"); $head[$h][1] = $langs->trans("MyTasks");
$head[$h][2] = 'mytasks'; $head[$h][2] = 'mytasks';
$h++; $h++;
*/
return $head; if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
{
$head[$h][0] = DOL_URL_ROOT.'/projet/gant/gantview.php?id='.$object->id;
$head[$h][1] = $langs->trans("Gantt");
$head[$h][2] = 'gantt';
$h++;
}
return $head;
} }

21
htdocs/projet/tasks/fiche.php
View File

@ -42,6 +42,7 @@ $result = restrictedArea($user, 'projet', $projectid);
$userAccess=0; $userAccess=0;
$langs->load("users"); $langs->load("users");
$langs->load("projects");
/* /*
@ -199,12 +200,11 @@ else
{ {
/* /*
* Fiche projet en mode visu * Fiche projet en mode visu
*
*/ */
$userstatic=new User($db); $userstatic=new User($db);
$tab='tasks'; $tab='tasks';
if ($_REQUEST["mode"]=='mine') $tab='mytasks'; //if ($_REQUEST["mode"]=='mine') $tab='mytasks';
$head=project_prepare_head($project); $head=project_prepare_head($project);
dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project')); dol_fiche_head($head, $tab, $langs->trans("Project"),0,($project->public?'projectpub':'project'));
@ -266,6 +266,23 @@ else
print '<br>'; print '<br>';
// Link to switch in "my task" / "all task"
print '<table width="100%"><tr><td align="right">';
if ($_REQUEST["mode"] == 'mine')
{
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'">'.$langs->trans("DoNotShowMyTasksOnly").'</a>';
//print ' - ';
//print $langs->trans("ShowMyTaskOnly");
}
else
{
//print $langs->trans("DoNotShowMyTaskOnly");
//print ' - ';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$project->id.'&mode=mine">'.$langs->trans("ShowMyTasksOnly").'</a>';
}
print '</td></tr></table>';
// Get list of tasks in tasksarray and taskarrayfiltered // Get list of tasks in tasksarray and taskarrayfiltered
// We need all tasks (even not limited to a user because a task to user // We need all tasks (even not limited to a user because a task to user
// can have a parent that is not affected to him). // can have a parent that is not affected to him).