// Fix AdminCarriers list

This commit is contained in:
tDidierjean
2011-11-20 18:37:31 +00:00
parent 46b1150f60
commit cc65b4e0cb
+11 -12
View File
@@ -56,14 +56,15 @@ class AdminCarriersControllerCore extends AdminController
), ),
'name' => array( 'name' => array(
'title' => $this->l('Name'), 'title' => $this->l('Name'),
'width' => 100 'width' => 'auto'
), ),
'image' => array( 'image' => array(
'title' => $this->l('Logo'), 'title' => $this->l('Logo'),
'align' => 'center', 'align' => 'center',
'image' => 's', 'image' => 's',
'orderby' => false, 'orderby' => false,
'search' => false 'search' => false,
'width' => 120
), ),
'delay' => array( 'delay' => array(
'title' => $this->l('Delay'), 'title' => $this->l('Delay'),
@@ -75,7 +76,8 @@ class AdminCarriersControllerCore extends AdminController
'align' => 'center', 'align' => 'center',
'active' => 'status', 'active' => 'status',
'type' => 'bool', 'type' => 'bool',
'orderby' => false 'orderby' => false,
'width' => 25
), ),
'is_free' => array( 'is_free' => array(
'title' => $this->l('Is Free'), 'title' => $this->l('Is Free'),
@@ -86,7 +88,8 @@ class AdminCarriersControllerCore extends AdminController
'default' => 'disabled.gif' 'default' => 'disabled.gif'
), ),
'type' => 'bool', 'type' => 'bool',
'orderby' => false 'orderby' => false,
'width' => 25
), ),
'position' => array( 'position' => array(
'title' => $this->l('Position'), 'title' => $this->l('Position'),
@@ -622,14 +625,6 @@ class AdminCarriersControllerCore extends AdminController
$carrier->addZone($zone['id_zone']); $carrier->addZone($zone['id_zone']);
} }
public function displayListContent($token = null)
{
foreach ($this->_list as $key => $list)
if ($list['name'] == '0')
$this->_list[$key]['name'] = Configuration::get('PS_SHOP_NAME');
parent::displayListContent($token);
}
/** /**
* Modifying initial getList method to display position feature (drag and drop) * Modifying initial getList method to display position feature (drag and drop)
*/ */
@@ -641,6 +636,10 @@ class AdminCarriersControllerCore extends AdminController
$order_by = 'position'; $order_by = 'position';
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);
foreach ($this->_list as $key => $list)
if ($list['name'] == '0')
$this->_list[$key]['name'] = Configuration::get('PS_SHOP_NAME');
} }
} }