diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index d2d3812400d..3e4ae193a94 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -41,6 +41,7 @@ $optioncss = GETPOST('optioncss', 'alpha'); $mode = GETPOST('mode', 'aZ'); $id = GETPOST("id", 'int'); +$search_title = GETPOST('search_title', 'alpha'); // Load variable for pagination $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; @@ -165,6 +166,9 @@ $sqlfields = $sql; // $sql fields to remove for count total $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as b LEFT JOIN ".MAIN_DB_PREFIX."user as u ON b.fk_user=u.rowid"; $sql .= " WHERE 1=1"; +if ($search_title) { + $sql .= natural_search('title', $search_title); +} $sql .= " AND b.entity IN (".getEntity('bookmark').")"; if (!$user->admin) { $sql .= " AND (b.fk_user = ".((int) $user->id)." OR b.fk_user is NULL OR b.fk_user = 0)"; @@ -313,21 +317,25 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { $totalarray['nbfield']++; } print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", $param, '', $sortfield, $sortorder); +$totalarray['nbfield']++; print_liste_field_titre("Title", $_SERVER["PHP_SELF"], "b.title", "", $param, '', $sortfield, $sortorder); +$totalarray['nbfield']++; print_liste_field_titre("Link", $_SERVER["PHP_SELF"], "b.url", "", $param, '', $sortfield, $sortorder); +$totalarray['nbfield']++; print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "b.target", "", $param, '', $sortfield, $sortorder, 'center '); +$totalarray['nbfield']++; print_liste_field_titre("Visibility", $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder, 'center '); +$totalarray['nbfield']++; print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "b.dateb", "", $param, '', $sortfield, $sortorder, 'center '); +$totalarray['nbfield']++; print_liste_field_titre("Position", $_SERVER["PHP_SELF"], "b.position", "", $param, '', $sortfield, $sortorder, 'right '); +$totalarray['nbfield']++; if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; $totalarray['nbfield']++; } print ''."\n"; -$totalarray = array(); -$totalarray['nbfield'] = 0; - // Loop on record // -------------------------------------------------------------------- $i = 0; @@ -475,7 +483,7 @@ if ($num == 0) { $colspan++; } } - print ''.$langs->trans("NoRecordFound").''; + print ''.$langs->trans("NoRecordFound").''; } $db->free($resql);