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

[-] BO : #PSCFV-2596 - Hide custom features values from customization detail list

Browse Source
This commit is contained in:
mDeflotte
2012-08-06 12:37:21 +00:00
parent d356d8d5da
commit e728f6ef06
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+5 -5
View File
@@ -2033,11 +2033,11 @@ class AdminControllerCore extends Controller
$having_clause = ''; $having_clause = '';
if (isset($this->_filterHaving) || isset($this->_having)) if (isset($this->_filterHaving) || isset($this->_having))
{ {
$having_clause = ' HAVING '; $having_clause = ' HAVING ';
if (isset($this->_filterHaving)) if (isset($this->_filterHaving))
$having_clause .= ltrim($this->_filterHaving, ' AND '); $having_clause .= ltrim($this->_filterHaving, ' AND ');
if (isset($this->_having)) if (isset($this->_having))
$having_clause .= $this->_having.' '; $having_clause .= $this->_having.' ';
} }
if (strpos($order_by, '.') > 0) if (strpos($order_by, '.') > 0)
controllers/admin/AdminFeaturesController.php
+3
View File
@@ -451,6 +451,9 @@ class AdminFeaturesControllerCore extends AdminController
*/ */
public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false)
{ {
if ($this->table == 'feature_value')
$this->_where .= ' AND a.custom = 0';
parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop); parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop);
if ($this->table == 'feature') if ($this->table == 'feature')