Skip to content
Snippets Groups Projects
Commit ac7b95df authored by FAVRE Pierre-Henry's avatar FAVRE Pierre-Henry Committed by GitHub
Browse files

Merge pull request #1 from atm-alexis/patch-1

little fix
parents fe1b1ede 736800dd
Branches
Tags
No related merge requests found
...@@ -251,7 +251,7 @@ class Listview ...@@ -251,7 +251,7 @@ class Listview
if (isset($TParam['type'][$field]) && ($TParam['type'][$field]==='date' || $TParam['type'][$field]==='datetime')) if (isset($TParam['type'][$field]) && ($TParam['type'][$field]==='date' || $TParam['type'][$field]==='datetime'))
{ {
$k = 'Listview_'.$this->id.'_search_'.$field; $k = 'Listview_'.$this->id.'_search_'.$field;
if ($info['recherche'] === 'calendars') if ($info['search_type'] === 'calendars')
{ {
$value = array(); $value = array();
...@@ -338,7 +338,7 @@ class Listview ...@@ -338,7 +338,7 @@ class Listview
$value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : ''; $value = isset($ListPOST[$this->id]['search'][$key]) ? $ListPOST[$this->id]['search'][$key] : '';
if ($removeFilter) $value = ''; if ($removeFilter) $value = '';
$typeRecherche = (is_array($param_search) && isset($param_search['recherche'])) ? $param_search['recherche'] : $param_search; $typeRecherche = (is_array($param_search) && isset($param_search['search_type'])) ? $param_search['search_type'] : $param_search;
if(is_array($typeRecherche)) if(is_array($typeRecherche))
{ {
...@@ -599,7 +599,7 @@ class Listview ...@@ -599,7 +599,7 @@ class Listview
$dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0; $dolibarr_decalage = $this->totalRow > $this->totalRowToShow ? 1 : 0;
ob_start(); ob_start();
print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&param', $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']); print_barre_liste($TParam['list']['title'], $TParam['limit']['page']-1, $_SERVER["PHP_SELF"], '&'.$TParam['list']['param_url'], $TParam['sortfield'], $TParam['sortorder'], '', $this->totalRowToShow+$dolibarr_decalage, $this->totalRow, $TParam['list']['image'], 0, '', '', $TParam['limit']['nbLine']);
$out .= ob_get_clean(); $out .= ob_get_clean();
...@@ -621,7 +621,7 @@ class Listview ...@@ -621,7 +621,7 @@ class Listview
if (empty($head['width'])) $head['width'] = 'auto'; if (empty($head['width'])) $head['width'] = 'auto';
if (!empty($head['width']) && !empty($head['text-align'])) $moreattrib .= 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"'; if (!empty($head['width']) && !empty($head['text-align'])) $moreattrib .= 'style="width:'.$head['width'].';text-align:'.$head['text-align'].'"';
if (isset($TParam['search'][$field]['recherche']) && $TParam['search'][$field]['recherche'] !== false) if (isset($TParam['search'][$field]['search_type']) && $TParam['search'][$field]['search_type'] !== false)
{ {
$TsKey = $this->getSearchKey($field, $TParam); $TsKey = $this->getSearchKey($field, $TParam);
if (!empty($TsKey)) $search = implode(',', $TsKey); if (!empty($TsKey)) $search = implode(',', $TsKey);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment