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

Fix duplicate search field

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-16 18:02:36 +01:00
parent 1c3fb7f94b
commit 59eefa46e6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/comm/action/list.php
View File

@ -127,7 +127,7 @@ $arrayfields=array(
'a.datep2'=>array('label'=>"DateEnd", 'checked'=>1), 'a.datep2'=>array('label'=>"DateEnd", 'checked'=>1),
's.nom'=>array('label'=>"ThirdParty", 'checked'=>1), 's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
'a.fk_contact'=>array('label'=>"Contact", 'checked'=>1), 'a.fk_contact'=>array('label'=>"Contact", 'checked'=>1),
'a.fk_element'=>array('label'=>"LinkedObject", 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))), 'a.fk_element'=>array('label'=>"LinkedObject", 'checked'=>0, 'enabled'=>(! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))),
'a.percent'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000), 'a.percent'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
); );
@ -427,7 +427,7 @@ if ($resql)
if (! empty($arrayfields['a.id']['checked'])) print '<td class="liste_titre"></td>'; if (! empty($arrayfields['a.id']['checked'])) print '<td class="liste_titre"></td>';
if (! empty($arrayfields['owner']['checked'])) print '<td class="liste_titre"></td>'; if (! empty($arrayfields['owner']['checked'])) print '<td class="liste_titre"></td>';
if (! empty($arrayfields['c.libelle']['checked'])) print '<td class="liste_titre"></td>'; if (! empty($arrayfields['c.libelle']['checked'])) print '<td class="liste_titre"></td>';
if (! empty($arrayfields['a.label']['checked'])) print '<td class="liste_titre"><input type="text" name="search_title" value="'.$search_title.'"></td>'; if (! empty($arrayfields['a.label']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="'.$search_title.'"></td>';
if (! empty($arrayfields['a.datep']['checked'])) { if (! empty($arrayfields['a.datep']['checked'])) {
print '<td class="liste_titre" align="center">'; print '<td class="liste_titre" align="center">';
print $form->select_date($datestart, 'datestart', 0, 0, 1, '', 1, 0, 1); print $form->select_date($datestart, 'datestart', 0, 0, 1, '', 1, 0, 1);
@ -454,6 +454,7 @@ if ($resql)
if (! empty($arrayfields['a.percent']['checked'])) { if (! empty($arrayfields['a.percent']['checked'])) {
print '<td class="liste_titre center">'; print '<td class="liste_titre center">';
print $formactions->form_select_status_action('formaction',$status,1,'status',1,2); print $formactions->form_select_status_action('formaction',$status,1,'status',1,2);
print ajax_combobox('selectstatus');
print '</td>'; print '</td>';
} }
// Action column // Action column
@ -560,14 +561,14 @@ if ($resql)
// Label // Label
if (! empty($arrayfields['a.label']['checked'])) { if (! empty($arrayfields['a.label']['checked'])) {
print '<td class="tdoverflowmax300">'; print '<td class="tdoverflowmax200">';
print $actionstatic->label; print $actionstatic->label;
print '</td>'; print '</td>';
} }
// Start date // Start date
if (! empty($arrayfields['a.datep']['checked'])) { if (! empty($arrayfields['a.datep']['checked'])) {
print '<td align="center" class="nowrap">'; print '<td align="center">';
print dol_print_date($db->jdate($obj->dp),"dayhour"); print dol_print_date($db->jdate($obj->dp),"dayhour");
$late=0; $late=0;
if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1; if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
@ -580,7 +581,7 @@ if ($resql)
// End date // End date
if (! empty($arrayfields['a.datep2']['checked'])) { if (! empty($arrayfields['a.datep2']['checked'])) {
print '<td align="center" class="nowrap">'; print '<td align="center">';
print dol_print_date($db->jdate($obj->dp2),"dayhour"); print dol_print_date($db->jdate($obj->dp2),"dayhour");
print '</td>'; print '</td>';
} }

2
htdocs/core/lib/agenda.lib.php
View File

@ -135,7 +135,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '</td></tr>'; print '</td></tr>';
} }
if ($canedit && ! preg_match('/listaction/', $_SERVER["PHP_SELF"])) if ($canedit && ! preg_match('/list/', $_SERVER["PHP_SELF"]))
{ {
// Status // Status
print '<tr>'; print '<tr>';