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

Fix: Bad help text

Browse Source 
Fix: Removed duplicate header
This commit is contained in:
Laurent Destailleur 2014-08-08 02:11:03 +02:00
parent 2eea7cdc7f
commit 4eeb92d082
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/projet/activity/list.php
View File

@ -70,7 +70,7 @@ if ($action == 'addtime' && $user->rights->projet->creer)
{ {
// We store HOURS in seconds // We store HOURS in seconds
if($matches[2]=='hour') $timespent_duration[$id] += $time*60*60; if($matches[2]=='hour') $timespent_duration[$id] += $time*60*60;
// We store MINUTES in seconds // We store MINUTES in seconds
if($matches[2]=='min') $timespent_duration[$id] += $time*60; if($matches[2]=='min') $timespent_duration[$id] += $time*60;
} }
@ -88,9 +88,9 @@ if ($action == 'addtime' && $user->rights->projet->creer)
$task->timespent_date = dol_mktime(12,0,0,$_POST["{$key}month"],$_POST["{$key}day"],$_POST["{$key}year"]); $task->timespent_date = dol_mktime(12,0,0,$_POST["{$key}month"],$_POST["{$key}day"],$_POST["{$key}year"]);
$task->addTimeSpent($user); $task->addTimeSpent($user);
} }
setEventMessage($langs->trans("RecordSaved")); setEventMessage($langs->trans("RecordSaved"));
// Redirect to avoid submit twice on back // Redirect to avoid submit twice on back
header('Location: '.$_SERVER["PHP_SELF"].'?id='.$projectid.($mode?'&mode='.$mode:'')); header('Location: '.$_SERVER["PHP_SELF"].'?id='.$projectid.($mode?'&mode='.$mode:''));
exit; exit;
@ -101,6 +101,8 @@ if ($action == 'addtime' && $user->rights->projet->creer)
} }
} }
/* /*
* View * View
*/ */
@ -113,7 +115,6 @@ $taskstatic = new Task($db);
$title=$langs->trans("TimeSpent"); $title=$langs->trans("TimeSpent");
if ($mine) $title=$langs->trans("MyTimeSpent"); if ($mine) $title=$langs->trans("MyTimeSpent");
//$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); //$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1);
$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1); // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1); // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project
@ -128,16 +129,19 @@ $projectsrole=$taskstatic->getUserRolesForProjectsOrTasks($user,0,($project->id?
$tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$user,($project->id?$project->id:$projectsListId),0); $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$user,($project->id?$project->id:$projectsListId),0);
llxHeader("",$title,"");
llxHeader("",$title,"");
llxHeader("",$title,""); llxHeader("",$title,"");
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
// Show description of content
if ($mine) print $langs->trans("MyTasksDesc").'<br><br>';
else
{
if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';
else print $langs->trans("ProjectsPublicTakDesc").'<br><br>';
}
// Filter on user // Filter on user
/* dol_fiche_head(''); /* dol_fiche_head('');
print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>'; print '<table class="border" width="100%"><tr><td width="25%">'.$langs->trans("User").'</td>';
@ -177,7 +181,7 @@ print '<td colspan="2">'.$langs->trans("AddDuration").'</td>';
print "</tr>\n"; print "</tr>\n";
// By default, we can edit only tasks we are assigned to // By default, we can edit only tasks we are assigned to
$restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJECTS)?1:0); $restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJECTS)?1:0);
if (count($tasksarray) > 0) if (count($tasksarray) > 0)
{ {

2
htdocs/projet/tasks/index.php
View File

@ -75,7 +75,7 @@ if ($id)
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
// Show description of content // Show description of content
if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>'; if ($mine) print $langs->trans("MyTasksDesc").'<br><br>';
else else
{ {
if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>'; if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").'<br><br>';