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

[-] BO : fixed filters on statuses tab #PSCFV-5763

Browse Source
This commit is contained in:
DamienMetzger
2012-11-22 19:49:20 +01:00
parent fdfe27dcd8
commit edf3a3b10e
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/HelperList.php
+1 -1
View File
@@ -261,7 +261,7 @@ class HelperListCore extends Helper
$path_to_image = _PS_IMG_DIR_.$params['image'].'/'.Image::getImgFolderStatic($tr['id_image']).(int)$tr['id_image'].'.'.$this->imageType; $path_to_image = _PS_IMG_DIR_.$params['image'].'/'.Image::getImgFolderStatic($tr['id_image']).(int)$tr['id_image'].'.'.$this->imageType;
$this->_list[$index][$key] = ImageManager::thumbnail($path_to_image, $this->table.'_mini_'.$item_id.'.'.$this->imageType, 45, $this->imageType); $this->_list[$index][$key] = ImageManager::thumbnail($path_to_image, $this->table.'_mini_'.$item_id.'.'.$this->imageType, 45, $this->imageType);
} }
elseif (isset($params['icon']) && (isset($params['icon'][$tr[$key]]) || isset($params['icon']['default']))) elseif (isset($params['icon']) && isset($tr[$key]) && (isset($params['icon'][$tr[$key]]) || isset($params['icon']['default'])))
{ {
if (isset($params['icon'][$tr[$key]]) && is_array($params['icon'][$tr[$key]])) if (isset($params['icon'][$tr[$key]]) && is_array($params['icon'][$tr[$key]]))
$this->_list[$index][$key] = array( $this->_list[$index][$key] = array(
controllers/admin/AdminStatusesController.php
+16 -10
View File
@@ -50,7 +50,7 @@ class AdminStatusesControllerCore extends AdminController
if (Tools::isSubmit('updateorder_return_state')) if (Tools::isSubmit('updateorder_return_state'))
$this->display = 'edit'; $this->display = 'edit';
parent::init(); return parent::init();
} }
/** /**
@@ -114,7 +114,6 @@ class AdminStatusesControllerCore extends AdminController
'width' => 120 'width' => 120
) )
); );
} }
/** /**
@@ -142,10 +141,6 @@ class AdminStatusesControllerCore extends AdminController
'color' => 'color' 'color' => 'color'
) )
); );
// call postProcess() for take care about actions and filters
$this->postProcess();
$this->toolbar_title = $this->l('Return statuses');
} }
protected function initOrderReturnsForm() protected function initOrderReturnsForm()
@@ -193,8 +188,14 @@ class AdminStatusesControllerCore extends AdminController
$lists = parent::renderList(); $lists = parent::renderList();
//init and render the second list //init and render the second list
$this->_filter = false;
$this->initOrdersReturnsList(); $this->initOrdersReturnsList();
// call postProcess() to take care of actions and filters
$this->postProcess();
$this->toolbar_title = $this->l('Return statuses');
$this->checkFilterForOrdersReturnsList(); $this->checkFilterForOrdersReturnsList();
parent::initToolbar(); parent::initToolbar();
$lists .= parent::renderList(); $lists .= parent::renderList();
@@ -393,7 +394,6 @@ class AdminStatusesControllerCore extends AdminController
return $helper->generateForm($this->fields_form); return $helper->generateForm($this->fields_form);
} }
protected function getTemplates($iso_code) protected function getTemplates($iso_code)
{ {
$array = array(); $array = array();
@@ -410,7 +410,6 @@ class AdminStatusesControllerCore extends AdminController
return $array; return $array;
} }
public function postProcess() public function postProcess()
{ {
if (Tools::isSubmit($this->table.'Orderby') || Tools::isSubmit($this->table.'Orderway')) if (Tools::isSubmit($this->table.'Orderby') || Tools::isSubmit($this->table.'Orderway'))
@@ -501,6 +500,13 @@ class AdminStatusesControllerCore extends AdminController
else else
return parent::postProcess(); return parent::postProcess();
} }
protected function filterToField($key, $filter)
{
if ($this->table == 'order_state')
$this->initOrderStatutsList();
elseif ($this->table == 'order_return_state')
$this->initOrdersReturnsList();
return parent::filterToField($key, $filter);
}
} }