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

Works on enhancement of project tasks

Browse Source
This commit is contained in:
Regis Houssin 2010-02-02 11:09:13 +00:00
parent d6d1612f3c
commit 4ac61b7459
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/multicompany/templates/admin-entity.tpl
View File

@ -22,8 +22,9 @@
<table class="noborder" width="100%"> <table class="noborder" width="100%">
<tr class="liste_titre"> <tr class="liste_titre">
<td>{$langs->trans('Name')}</td> <td>{$langs->trans('Label')}</td>
<td align="left">{$langs->trans('Description')}</td> <td align="left">{$langs->trans('Description')}</td>
<td align="left">{$langs->trans('Name')}</td>
<td align="left">{$langs->trans('Town')}</td> <td align="left">{$langs->trans('Town')}</td>
<td align="left">{$langs->trans('Country')}</td> <td align="left">{$langs->trans('Country')}</td>
<td align="left">{$langs->trans('Currency')}</td> <td align="left">{$langs->trans('Currency')}</td>
@ -36,6 +37,7 @@
<tr class="{cycle values="impair,pair"}"> <tr class="{cycle values="impair,pair"}">
<td>{$entities[mc].label}</td> <td>{$entities[mc].label}</td>
<td align="left">{$entities[mc].description}</td> <td align="left">{$entities[mc].description}</td>
<td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_NOM}</td>
<td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_VILLE}</td> <td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_VILLE}</td>
<td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_PAYS}</td> <td align="left">{$entities[mc].details.MAIN_INFO_SOCIETE_PAYS}</td>
<td align="left">{$entities[mc].details.MAIN_MONNAIE}</td> <td align="left">{$entities[mc].details.MAIN_MONNAIE}</td>

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

@ -197,8 +197,23 @@ else
$param=($_REQUEST["mode"]=='mine'?'&mode=mine':''); $param=($_REQUEST["mode"]=='mine'?'&mode=mine':'');
print '<form name="addtime" method="POST" action="'.$_SERVER['PHP_SELF'].'?id='.$project->id.'">'; // To verify role of users
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; $userAccess = 0;
foreach(array('internal','external') as $source)
{
$userRole = $project->liste_contact(4,$source);
$num=sizeof($userRole);
$i = 0;
while ($i < $num)
{
if ($userRole[$i]['code'] == 'PROJECTLEADER' && $user->id == $userRole[$i]['id'])
{
$userAccess++;
}
$i++;
}
}
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -247,9 +262,6 @@ else
print '</table>'; print '</table>';
print '<input type="hidden" name="action" value="addtime">';
print '</form>';
print '</div>'; print '</div>';
/* /*
@ -259,7 +271,7 @@ else
if ($user->rights->projet->creer) if ($user->rights->projet->creer)
{ {
if (empty($project->user_resp_id) || $project->user_resp_id == -1 || $project->user_resp_id == $user->id) if ($userAccess)
{ {
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$project->id.'&action=create'.$param.'">'.$langs->trans('AddTask').'</a>'; print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$project->id.'&action=create'.$param.'">'.$langs->trans('AddTask').'</a>';
} }