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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-16 09:25:57 +02:00
parent c0afb55d11 3b9c125198
commit d7c1cd90bf
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStatusesController.php
+1
View File
@@ -136,6 +136,7 @@ class AdminStatusesControllerCore extends AdminController
{ {
$this->table = 'order_return_state'; $this->table = 'order_return_state';
$this->_defaultOrderBy = $this->identifier = 'id_order_return_state'; $this->_defaultOrderBy = $this->identifier = 'id_order_return_state';
$this->list_id = 'order_return_state';
$this->deleted = false; $this->deleted = false;
$this->_orderBy = null; $this->_orderBy = null;
js/admin.js
+1 -1
View File
@@ -481,7 +481,7 @@ function askFeatureName(selected, selector)
{ {
var elem; var elem;
if (selected.value == 'feature') if (selected.value == 'features')
{ {
$('#features_' + selector).show(); $('#features_' + selector).show();
$('#feature_name_' + selector).attr('name', selected.name); $('#feature_name_' + selector).attr('name', selected.name);
modules/blocknewproducts/blocknewproducts.php
+5
View File
@@ -134,6 +134,11 @@ class BlockNewProducts extends Module
{ {
return $this->hookRightColumn($params); return $this->hookRightColumn($params);
} }
public function hookHome($params)
{
return $this->hookRightColumn($params);
}
public function hookHeader($params) public function hookHeader($params)
{ {