dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : fixed sorting and filter in BO tabs #PSCFV-5618

Browse Source
This commit is contained in:
DamienMetzger
2012-11-22 15:46:49 +01:00
parent d8c129f113
commit c374380a92
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+6
View File
@@ -2069,12 +2069,18 @@ class AdminControllerCore extends Controller
if ($this->explicitSelect) if ($this->explicitSelect)
{ {
foreach ($this->fields_list as $key => $array_value) foreach ($this->fields_list as $key => $array_value)
{
// Add it only if it is not already in $this->_select
if (isset($this->_select) && preg_match('/'.preg_quote($key, '/').'`?\s*,/', $this->_select))
continue;
if (isset($array_value['filter_key'])) if (isset($array_value['filter_key']))
$this->_listsql .= str_replace('!', '.', $array_value['filter_key']).' as '.$key.','; $this->_listsql .= str_replace('!', '.', $array_value['filter_key']).' as '.$key.',';
elseif ($key == 'id_'.$this->table) elseif ($key == 'id_'.$this->table)
$this->_listsql .= 'a.`'.bqSQL($key).'`,'; $this->_listsql .= 'a.`'.bqSQL($key).'`,';
elseif ($key != 'image' && !preg_match('/'.preg_quote($key, '/').'/i', $this->_select)) elseif ($key != 'image' && !preg_match('/'.preg_quote($key, '/').'/i', $this->_select))
$this->_listsql .= '`'.bqSQL($key).'`,'; $this->_listsql .= '`'.bqSQL($key).'`,';
}
$this->_listsql = rtrim($this->_listsql, ','); $this->_listsql = rtrim($this->_listsql, ',');
} }
else else