|
|
@@ -116,11 +116,11 @@ $arrayfields = array();
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
// If $val['visible']==0, then we never show the field
|
|
|
if (!empty($val['visible'])) {
|
|
|
- $visible = (int) dol_eval($val['visible'], 1, 1, '1');
|
|
|
+ $visible = (int) dol_eval($val['visible'], 1);
|
|
|
$arrayfields['t.'.$key] = array(
|
|
|
'label'=>$val['label'],
|
|
|
'checked'=>(($visible < 0) ? 0 : 1),
|
|
|
- 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
|
|
|
+ 'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
|
|
|
'position'=>$val['position'],
|
|
|
'help'=> isset($val['help']) ? $val['help'] : ''
|
|
|
);
|
|
|
@@ -137,18 +137,15 @@ $permissiontoread = $user->rights->hrm->all->read;
|
|
|
$permissiontoadd = $user->rights->hrm->all->write;
|
|
|
$permissiontodelete = $user->rights->hrm->all->delete;
|
|
|
|
|
|
-// Security check
|
|
|
-if (empty($conf->hrm->enabled)) {
|
|
|
- accessforbidden('Module not enabled');
|
|
|
-}
|
|
|
-
|
|
|
// Security check (enable the most restrictive one)
|
|
|
if ($user->socid > 0) accessforbidden();
|
|
|
//if ($user->socid > 0) accessforbidden();
|
|
|
//$socid = 0; if ($user->socid > 0) $socid = $user->socid;
|
|
|
//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
|
|
|
//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
|
|
|
-if (empty($conf->hrm->enabled)) accessforbidden();
|
|
|
+if (!isModEnabled('hrm')) {
|
|
|
+ accessforbidden('Module hrm not enabled');
|
|
|
+}
|
|
|
if (!$permissiontoread) accessforbidden();
|
|
|
|
|
|
|
|
|
@@ -257,17 +254,17 @@ foreach ($search as $key => $val) {
|
|
|
$mode_search = 2;
|
|
|
}
|
|
|
if ($search[$key] != '') {
|
|
|
- $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
|
|
|
+ $sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
|
|
|
}
|
|
|
} else {
|
|
|
if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
|
|
|
$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
|
|
|
if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
|
|
|
if (preg_match('/_dtstart$/', $key)) {
|
|
|
- $sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
|
|
|
+ $sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
|
|
|
}
|
|
|
if (preg_match('/_dtend$/', $key)) {
|
|
|
- $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
|
|
|
+ $sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -287,7 +284,7 @@ $sql .= $hookmanager->resPrint;
|
|
|
/* If a group by is required
|
|
|
$sql .= " GROUP BY ";
|
|
|
foreach($object->fields as $key => $val) {
|
|
|
- $sql .= "t.".$key.", ";
|
|
|
+ $sql .= "t.".$db->escape($key).", ";
|
|
|
}
|
|
|
// Add fields from extrafields
|
|
|
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
|
|
|
@@ -302,8 +299,6 @@ $sql .= $hookmanager->resPrint;
|
|
|
$sql = preg_replace('/,\s*$/', '', $sql);
|
|
|
*/
|
|
|
|
|
|
-$sql .= $db->order($sortfield, $sortorder);
|
|
|
-
|
|
|
// Count total nb of records
|
|
|
$nbtotalofrecords = '';
|
|
|
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
|
|
|
@@ -313,24 +308,24 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
|
|
|
$page = 0;
|
|
|
$offset = 0;
|
|
|
}
|
|
|
+ $db->free($resql);
|
|
|
}
|
|
|
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
|
|
|
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
|
|
|
- $num = $nbtotalofrecords;
|
|
|
-} else {
|
|
|
- if ($limit) {
|
|
|
- $sql .= $db->plimit($limit + 1, $offset);
|
|
|
- }
|
|
|
|
|
|
- $resql = $db->query($sql);
|
|
|
- if (!$resql) {
|
|
|
- dol_print_error($db);
|
|
|
- exit;
|
|
|
- }
|
|
|
+// Complete request and execute it with limit
|
|
|
+$sql .= $db->order($sortfield, $sortorder);
|
|
|
+if ($limit) {
|
|
|
+ $sql .= $db->plimit($limit + 1, $offset);
|
|
|
+}
|
|
|
|
|
|
- $num = $db->num_rows($resql);
|
|
|
+$resql = $db->query($sql);
|
|
|
+if (!$resql) {
|
|
|
+ dol_print_error($db);
|
|
|
+ exit;
|
|
|
}
|
|
|
|
|
|
+$num = $db->num_rows($resql);
|
|
|
+
|
|
|
+
|
|
|
// Direct jump if only one record found
|
|
|
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
|
|
|
$obj = $db->fetch_object($resql);
|
|
|
@@ -373,11 +368,17 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
|
|
|
$param .= '&limit='.urlencode($limit);
|
|
|
}
|
|
|
foreach ($search as $key => $val) {
|
|
|
- if (is_array($search[$key]) && count($search[$key])) {
|
|
|
+ if (is_array($search[$key])) {
|
|
|
foreach ($search[$key] as $skey) {
|
|
|
- $param .= '&search_'.$key.'[]='.urlencode($skey);
|
|
|
+ if ($skey != '') {
|
|
|
+ $param .= '&search_'.$key.'[]='.urlencode($skey);
|
|
|
+ }
|
|
|
}
|
|
|
- } else {
|
|
|
+ } elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
|
|
|
+ $param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
|
|
|
+ $param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
|
|
|
+ $param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
|
|
|
+ } elseif ($search[$key] != '') {
|
|
|
$param .= '&search_'.$key.'='.urlencode($search[$key]);
|
|
|
}
|
|
|
}
|
|
|
@@ -398,7 +399,7 @@ $arrayofmassactions = array(
|
|
|
//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
|
|
|
//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
|
|
|
);
|
|
|
-if ($permissiontodelete) {
|
|
|
+if (!empty($permissiontodelete)) {
|
|
|
$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
|
|
|
}
|
|
|
if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
|
|
|
@@ -435,9 +436,12 @@ $trackid = 'xxxx'.$object->id;
|
|
|
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
|
|
|
|
|
|
if ($search_all) {
|
|
|
+ $setupstring = '';
|
|
|
foreach ($fieldstosearchall as $key => $val) {
|
|
|
$fieldstosearchall[$key] = $langs->trans($val);
|
|
|
+ $setupstring .= $key."=".$val.";";
|
|
|
}
|
|
|
+ print '<!-- Search done like if JOBPOSITION_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
|
|
|
print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
|
|
|
}
|
|
|
|
|
|
@@ -461,7 +465,7 @@ if (!empty($moreforfilter)) {
|
|
|
}
|
|
|
|
|
|
$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
|
|
|
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
|
|
|
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
|
|
|
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
|
|
|
|
|
print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
|
|
|
@@ -471,7 +475,15 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
|
|
|
// Fields title search
|
|
|
// --------------------------------------------------------------------
|
|
|
print '<tr class="liste_titre">';
|
|
|
+// Action column
|
|
|
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print '<td class="liste_titre maxwidthsearch">';
|
|
|
+ $searchpicto = $form->showFilterButtons('left');
|
|
|
+ print $searchpicto;
|
|
|
+ print '</td>';
|
|
|
+}
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
+ $searchkey = empty($search[$key]) ? '' : $search[$key];
|
|
|
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
|
|
|
if ($key == 'status') {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
@@ -479,7 +491,7 @@ foreach ($object->fields as $key => $val) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
} elseif (in_array($val['type'], array('timestamp'))) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
|
|
|
- } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
|
|
|
+ } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'right';
|
|
|
}
|
|
|
if (!empty($arrayfields['t.'.$key]['checked'])) {
|
|
|
@@ -487,9 +499,7 @@ foreach ($object->fields as $key => $val) {
|
|
|
if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
|
|
|
print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
|
|
|
} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
|
|
|
- print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
|
|
|
- } elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
|
|
|
- print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
|
|
|
+ print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth125', 1);
|
|
|
} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
|
|
|
print '<div class="nowrap">';
|
|
|
print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
|
|
|
@@ -497,6 +507,12 @@ foreach ($object->fields as $key => $val) {
|
|
|
print '<div class="nowrap">';
|
|
|
print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
|
|
|
print '</div>';
|
|
|
+ } elseif ($key == 'lang') {
|
|
|
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
|
|
|
+ $formadmin = new FormAdmin($db);
|
|
|
+ print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
|
|
|
+ } else {
|
|
|
+ print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
|
|
|
}
|
|
|
print '</td>';
|
|
|
}
|
|
|
@@ -509,16 +525,23 @@ $parameters = array('arrayfields'=>$arrayfields);
|
|
|
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
print $hookmanager->resPrint;
|
|
|
// Action column
|
|
|
-print '<td class="liste_titre maxwidthsearch">';
|
|
|
-$searchpicto = $form->showFilterButtons();
|
|
|
-print $searchpicto;
|
|
|
-print '</td>';
|
|
|
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print '<td class="liste_titre maxwidthsearch">';
|
|
|
+ $searchpicto = $form->showFilterButtons();
|
|
|
+ print $searchpicto;
|
|
|
+ print '</td>';
|
|
|
+}
|
|
|
print '</tr>'."\n";
|
|
|
|
|
|
+$totalarray = array();
|
|
|
+$totalarray['nbfield'] = 0;
|
|
|
|
|
|
// Fields title label
|
|
|
// --------------------------------------------------------------------
|
|
|
print '<tr class="liste_titre">';
|
|
|
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
|
|
+}
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
|
|
|
if ($key == 'status') {
|
|
|
@@ -527,21 +550,26 @@ foreach ($object->fields as $key => $val) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'center';
|
|
|
} elseif (in_array($val['type'], array('timestamp'))) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
|
|
|
- } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
|
|
|
+ } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
|
|
|
$cssforfield .= ($cssforfield ? ' ' : '').'right';
|
|
|
}
|
|
|
+ $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
|
|
|
if (!empty($arrayfields['t.'.$key]['checked'])) {
|
|
|
print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
|
|
|
+ $totalarray['nbfield']++;
|
|
|
}
|
|
|
}
|
|
|
// Extra fields
|
|
|
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
|
|
|
// Hook fields
|
|
|
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
|
|
|
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
|
|
|
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
print $hookmanager->resPrint;
|
|
|
// Action column
|
|
|
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
|
|
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
|
|
|
+}
|
|
|
+$totalarray['nbfield']++;
|
|
|
print '</tr>'."\n";
|
|
|
|
|
|
|
|
|
@@ -559,9 +587,11 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
|
|
|
// Loop on record
|
|
|
// --------------------------------------------------------------------
|
|
|
$i = 0;
|
|
|
+$savnbfield = $totalarray['nbfield'];
|
|
|
$totalarray = array();
|
|
|
$totalarray['nbfield'] = 0;
|
|
|
-while ($i < ($limit ? min($num, $limit) : $num)) {
|
|
|
+$imaxinloop = ($limit ? min($num, $limit) : $num);
|
|
|
+while ($i < $imaxinloop) {
|
|
|
$obj = $db->fetch_object($resql);
|
|
|
if (empty($obj)) {
|
|
|
break; // Should not happen
|
|
|
@@ -571,29 +601,35 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
|
|
|
$object->setVarsFromFetchObj($obj);
|
|
|
|
|
|
if ($mode == 'kanban') {
|
|
|
- if ($i == 0) {
|
|
|
- print '<tr><td colspan="12">';
|
|
|
- print '<div class="box-flex-container">';
|
|
|
- }
|
|
|
- // Output Kanban
|
|
|
-
|
|
|
$object->deplacement = $obj->deplacement;
|
|
|
$object->description = $obj->description;
|
|
|
|
|
|
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
|
|
|
- $selected = 0;
|
|
|
- if (in_array($object->id, $arrayofselected)) {
|
|
|
- $selected = 1;
|
|
|
- }
|
|
|
- print $object->getKanbanView('');
|
|
|
+ if ($i == 0) {
|
|
|
+ print '<tr><td colspan="'.$savnbfield.'">';
|
|
|
+ print '<div class="box-flex-container">';
|
|
|
}
|
|
|
- if ($i == (min($num, $limit) - 1)) {
|
|
|
+ // Output Kanban
|
|
|
+ print $object->getKanbanView('');
|
|
|
+ if ($i == ($imaxinloop - 1)) {
|
|
|
print '</div>';
|
|
|
print '</td></tr>';
|
|
|
}
|
|
|
} else {
|
|
|
// Show here line of result
|
|
|
- print '<tr class="oddeven">';
|
|
|
+ $j = 0;
|
|
|
+ print '<tr data-rowid="'.$object->id.'" class="oddeven">';
|
|
|
+ // Action column
|
|
|
+ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print '<td class="nowrap center">';
|
|
|
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
|
|
|
+ $selected = 0;
|
|
|
+ if (in_array($object->id, $arrayofselected)) {
|
|
|
+ $selected = 1;
|
|
|
+ }
|
|
|
+ print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
|
|
+ }
|
|
|
+ print '</td>';
|
|
|
+ }
|
|
|
foreach ($object->fields as $key => $val) {
|
|
|
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
|
|
|
if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
|
|
|
@@ -614,7 +650,11 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
|
|
|
//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
|
|
|
|
|
|
if (!empty($arrayfields['t.'.$key]['checked'])) {
|
|
|
- print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
|
|
|
+ print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
|
|
|
+ if (preg_match('/tdoverflow/', $cssforfield)) {
|
|
|
+ print ' title="'.dol_escape_htmltag($object->$key).'"';
|
|
|
+ }
|
|
|
+ print '>';
|
|
|
if ($key == 'status') {
|
|
|
print $object->getLibStatut(5);
|
|
|
} elseif ($key == 'rowid') {
|
|
|
@@ -649,21 +689,24 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
|
|
|
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
print $hookmanager->resPrint;
|
|
|
// Action column
|
|
|
- print '<td class="nowrap center">';
|
|
|
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
|
|
|
- $selected = 0;
|
|
|
- if (in_array($object->id, $arrayofselected)) {
|
|
|
- $selected = 1;
|
|
|
+ if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
|
|
|
+ print '<td class="nowrap center">';
|
|
|
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
|
|
|
+ $selected = 0;
|
|
|
+ if (in_array($object->id, $arrayofselected)) {
|
|
|
+ $selected = 1;
|
|
|
+ }
|
|
|
+ print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
|
|
}
|
|
|
- print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
|
|
|
+ print '</td>';
|
|
|
}
|
|
|
- print '</td>';
|
|
|
if (!$i) {
|
|
|
$totalarray['nbfield']++;
|
|
|
}
|
|
|
|
|
|
print '</tr>'."\n";
|
|
|
}
|
|
|
+
|
|
|
$i++;
|
|
|
}
|
|
|
|
|
|
@@ -678,14 +721,14 @@ if ($num == 0) {
|
|
|
$colspan++;
|
|
|
}
|
|
|
}
|
|
|
- print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
|
|
|
+ print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
|
|
|
}
|
|
|
|
|
|
|
|
|
$db->free($resql);
|
|
|
|
|
|
$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
|
|
|
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
|
|
|
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
|
|
|
print $hookmanager->resPrint;
|
|
|
|
|
|
print '</table>'."\n";
|
Laurent Destailleur