Can filter action on project
This commit is contained in:
parent
2d760f2e0d
commit
c632cef129
@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
|
* Copyright (C) 2003 Eric Seigne <erics@rycks.com>
|
||||||
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
|
* Copyright (C) 2005-2009 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
|
||||||
@ -175,31 +175,26 @@ if ($canedit || $conf->projet->enabled)
|
|||||||
print '<input type="hidden" name="showbirthday" value="'.$showbirthday.'">';
|
print '<input type="hidden" name="showbirthday" value="'.$showbirthday.'">';
|
||||||
print '<input type="hidden" name="action" value="'.$_REQUEST['action'].'">';
|
print '<input type="hidden" name="action" value="'.$_REQUEST['action'].'">';
|
||||||
print '<table class="border" width="100%">';
|
print '<table class="border" width="100%">';
|
||||||
|
if ($canedit || $conf->projet->enabled)
|
||||||
|
{
|
||||||
|
print '<tr><td nowrap="nowrap">';
|
||||||
|
|
||||||
|
print '<table class="nobordernopadding">';
|
||||||
|
|
||||||
if ($canedit)
|
if ($canedit)
|
||||||
{
|
{
|
||||||
$rowspan=3;
|
|
||||||
if ($conf->projet->enabled) $rowspan++;
|
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td nowrap="nowrap">';
|
print '<td nowrap="nowrap">';
|
||||||
print $langs->trans("ActionsAskedBy");
|
print $langs->trans("ActionsAskedBy");
|
||||||
print '</td><td nowrap="nowrap">';
|
print '</td><td nowrap="nowrap">';
|
||||||
print $form->select_users($filtera,'userasked',1,'',!$canedit);
|
print $form->select_users($filtera,'userasked',1,'',!$canedit);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '<td rowspan="'.$rowspan.'" align="center" valign="middle" nowrap="nowrap">';
|
|
||||||
print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'">';
|
|
||||||
print '<br>';
|
|
||||||
print '<br>';
|
|
||||||
print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
|
|
||||||
print '</td>';
|
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
print '<tr>';
|
print '<tr>'; print '<td nowrap="nowrap">'; print $langs->trans("ActionsToDoBy");
|
||||||
print '<td nowrap="nowrap">';
|
|
||||||
print $langs->trans("ActionsToDoBy");
|
|
||||||
print '</td><td nowrap="nowrap">';
|
print '</td><td nowrap="nowrap">';
|
||||||
print $form->select_users($filtert,'usertodo',1,'',!$canedit);
|
print $form->select_users($filtert,'usertodo',1,'',!$canedit);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td nowrap="nowrap">';
|
print '<td nowrap="nowrap">';
|
||||||
print $langs->trans("ActionsDoneBy");
|
print $langs->trans("ActionsDoneBy");
|
||||||
@ -207,14 +202,25 @@ if ($canedit || $conf->projet->enabled)
|
|||||||
print $form->select_users($filterd,'userdone',1,'',!$canedit);
|
print $form->select_users($filterd,'userdone',1,'',!$canedit);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($conf->projet->enabled)
|
if ($conf->projet->enabled)
|
||||||
{
|
{
|
||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td nowrap="nowrap">';
|
print '<td nowrap="nowrap">';
|
||||||
print $langs->trans("Project");
|
print $langs->trans("Project").' '; print '</td><td nowrap="nowrap">'; select_projects($socid,$_REQUEST["projectid"],'projectid'); print '</td></tr>';
|
||||||
print '</td><td nowrap="nowrap">';
|
}
|
||||||
select_projects($socid,$_REQUEST["projectid"],'projectid');
|
|
||||||
print '</td></tr>';
|
print '</table>';
|
||||||
|
print '</td>';
|
||||||
|
|
||||||
|
// Buttons
|
||||||
|
print '<td align="center" valign="middle" nowrap="nowrap">';
|
||||||
|
print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'">';
|
||||||
|
print '<br>';
|
||||||
|
print '<br>';
|
||||||
|
print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
|
||||||
|
print '</td>';
|
||||||
|
print '</tr>';
|
||||||
}
|
}
|
||||||
print '</table>';
|
print '</table>';
|
||||||
print '</form><br>';
|
print '</form><br>';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user