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

// Rename fieldsDisplay to fields_list part2 (timeout)

Browse Source
This commit is contained in:
tDidierjean
2012-03-29 16:29:31 +00:00
parent 215ca93f95
commit ba2abcd990
26 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCountriesController.php
+1 -1
View File
@@ -67,7 +67,7 @@ class AdminCountriesControllerCore extends AdminController
)
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_country' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminCurrenciesController.php
+1 -1
View File
@@ -41,7 +41,7 @@ class AdminCurrenciesControllerCore extends AdminController
{
parent::init();
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_currency' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'name' => array('title' => $this->l('Currency')),
'iso_code' => array('title' => $this->l('ISO code'), 'align' => 'center', 'width' => 80),
controllers/admin/AdminCustomerThreadsController.php
+1 -1
View File
@@ -58,7 +58,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
'pending2' => 'status_orange.png'
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_customer_thread' => array(
'title' => $this->l('ID'),
'width' => 25,
controllers/admin/AdminCustomersController.php
+1 -1
View File
@@ -62,7 +62,7 @@ class AdminCustomersControllerCore extends AdminController
$genders[$gender->id] = $gender->name;
}
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_customer' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminEmployeesController.php
+1 -1
View File
@@ -71,7 +71,7 @@ class AdminEmployeesControllerCore extends AdminController
foreach ($profiles as $profile)
$this->profiles_array[$profile['name']] = $profile['name'];
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_employee' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'lastname' => array('title' => $this->l('Last name'), 'width' => 'auto'),
'firstname' => array('title' => $this->l('First name'), 'width' => 130),
controllers/admin/AdminFeaturesController.php
+3 -3
View File
@@ -34,7 +34,7 @@ class AdminFeaturesControllerCore extends AdminController
$this->className = 'Feature';
$this->lang = true;
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_feature' => array(
'title' => $this->l('ID'),
'width' => 25
@@ -130,7 +130,7 @@ class AdminFeaturesControllerCore extends AdminController
if (!Validate::isLoadedObject($obj = new Feature((int)$id)))
$this->errors[] = Tools::displayError('An error occurred while updating status for object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_feature_value' => array(
'title' => $this->l('ID'),
'width' => 25
@@ -160,7 +160,7 @@ class AdminFeaturesControllerCore extends AdminController
$helper->simple_header = true;
$helper->show_toolbar = false;
$helper->bulk_actions = $this->bulk_actions;
$content = $helper->generateList($this->_list, $this->fieldsDisplay);
$content = $helper->generateList($this->_list, $this->fields_list);
echo Tools::jsonEncode(array('use_parent_structure' => false, 'data' => $content));
exit;
controllers/admin/AdminGendersController.php
+2 -2
View File
@@ -52,7 +52,7 @@ class AdminGendersControllerCore extends AdminController
'dir' => 'genders'
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_gender' => array(
'title' => $this->l('ID'),
'align' => 'center',
@@ -172,7 +172,7 @@ class AdminGendersControllerCore extends AdminController
public function displayGenderType($value, $tr)
{
return $this->fieldsDisplay['type']['list'][$value];
return $this->fields_list['type']['list'][$value];
}
protected function postImage($id)
controllers/admin/AdminGroupShopController.php
+1 -1
View File
@@ -45,7 +45,7 @@ class AdminGroupShopControllerCore extends AdminController
if (!Tools::getValue('realedit'))
$this->deleted = false;
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_group_shop' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminGroupsController.php
+1 -1
View File
@@ -50,7 +50,7 @@ class AdminGroupsControllerCore extends AdminController
Configuration::get('PS_CUSTOMER_GROUP')
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_group' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminImagesController.php
+1 -1
View File
@@ -39,7 +39,7 @@ class AdminImagesControllerCore extends AdminController
$this->addRowAction('edit');
$this->addRowAction('delete');
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'name' => array('title' => $this->l('Name'), 'size' => 16),
'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
controllers/admin/AdminLanguagesController.php
+1 -1
View File
@@ -50,7 +50,7 @@ class AdminLanguagesControllerCore extends AdminController
)
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_lang' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminLogsController.php
+1 -1
View File
@@ -37,7 +37,7 @@ class AdminLogsControllerCore extends AdminController
$this->addRowAction('delete');
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_log' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'severity' => array('title' => $this->l('Severity (1-4)'), 'align' => 'center', 'width' => 50),
'message' => array('title' => $this->l('Message')),
controllers/admin/AdminManufacturersController.php
+3 -3
View File
@@ -48,7 +48,7 @@ class AdminManufacturersControllerCore extends AdminController
'dir' => 'm'
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_manufacturer' => array(
'title' => $this->l('ID'),
'width' => 25
@@ -123,7 +123,7 @@ class AdminManufacturersControllerCore extends AdminController
$this->toolbar_title = $this->l('Addresses');
// reset actions and query vars
$this->actions = array();
unset($this->fieldsDisplay, $this->_select, $this->_join, $this->_group, $this->_filterHaving, $this->_filter);
unset($this->fields_list, $this->_select, $this->_join, $this->_group, $this->_filterHaving, $this->_filter);
$this->table = 'address';
$this->identifier = 'id_address';
@@ -148,7 +148,7 @@ class AdminManufacturersControllerCore extends AdminController
foreach ($countries as $country)
$this->countries_array[$country['id_country']] = $country['name'];
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_address' => array(
'title' => $this->l('ID'),
'width' => 25
controllers/admin/AdminMetaController.php
+1 -1
View File
@@ -45,7 +45,7 @@ class AdminMetaControllerCore extends AdminController
$this->addRowAction('delete');
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_meta' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'page' => array('title' => $this->l('Page'), 'width' => 120),
'title' => array('title' => $this->l('Title'), 'width' => 120),
controllers/admin/AdminOrderMessageController.php
+1 -1
View File
@@ -44,7 +44,7 @@ class AdminOrderMessageControllerCore extends AdminController
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_order_message' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminOrdersController.php
+1 -1
View File
@@ -62,7 +62,7 @@ class AdminOrdersControllerCore extends AdminController
foreach ($statuses as $status)
$statuses_array[$status['id_order_state']] = $status['name'];
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_order' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminOutstandingController.php
+1 -1
View File
@@ -50,7 +50,7 @@ class AdminOutstandingControllerCore extends AdminController
foreach (Risk::getRisks() as $risk)
$risks[$risk->id] = $risk->name;
$this->fieldsDisplay = array(
$this->fields_list = array(
'number' => array(
'title' => $this->l('Invoice Number'),
'align' => 'center',
controllers/admin/AdminProductsController.php
+8 -8
View File
@@ -84,7 +84,7 @@ class AdminProductsControllerCore extends AdminController
$this->max_file_size = (int)(Configuration::get('PS_LIMIT_UPLOAD_FILE_VALUE') * 1000000);
$this->max_image_size = (int)Configuration::get('PS_PRODUCT_PICTURE_MAX_SIZE');
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_product' => array(
'title' => $this->l('ID'),
'align' => 'center',
@@ -1976,7 +1976,7 @@ class AdminProductsControllerCore extends AdminController
$this->addRowAction('delete');
if (!Tools::getValue('id_category'))
unset($this->fieldsDisplay['position']);
unset($this->fields_list['position']);
return parent::renderList();
}
@@ -3330,7 +3330,7 @@ class AdminProductsControllerCore extends AdminController
$color_by_default = '#BDE5F8';
$this->fieldsDisplay = array(
$this->fields_list = array(
'attributes' => array('title' => $this->l('Attributes'), 'align' => 'left'),
'price' => array('title' => $this->l('Impact'), 'type' => 'price', 'align' => 'left', 'width' => 70),
'weight' => array('title' => $this->l('Weight'), 'align' => 'left', 'width' => 70),
@@ -3343,10 +3343,10 @@ class AdminProductsControllerCore extends AdminController
if ($id_product_download && !empty($product_download->display_filename))
{
$this->fieldsDisplay['Filename'] = array('title' => $this->l('Filename'), 'align' => 'center', 'width' => 70);
$this->fieldsDisplay['nb_downloadable'] = array('title' => $this->l('Number of downloads'), 'align' => 'center', 'width' => 70);
$this->fieldsDisplay['date_expiration'] = array('title' => $this->l('Number of days'), 'align' => 'center', 'width' => 70);
$this->fieldsDisplay['is_shareable'] = array('title' => $this->l('Share'), 'align' => 'center', 'width' => 70);
$this->fields_list['Filename'] = array('title' => $this->l('Filename'), 'align' => 'center', 'width' => 70);
$this->fields_list['nb_downloadable'] = array('title' => $this->l('Number of downloads'), 'align' => 'center', 'width' => 70);
$this->fields_list['date_expiration'] = array('title' => $this->l('Number of days'), 'align' => 'center', 'width' => 70);
$this->fields_list['is_shareable'] = array('title' => $this->l('Share'), 'align' => 'center', 'width' => 70);
}
if ($product->id)
@@ -3461,7 +3461,7 @@ class AdminProductsControllerCore extends AdminController
$helper->colorOnBackground = true;
$helper->override_folder = $this->tpl_folder.'combination/';
return $helper->generateList($comb_array, $this->fieldsDisplay);
return $helper->generateList($comb_array, $this->fields_list);
}
public function initFormQuantities($obj, $languages)
controllers/admin/AdminProfilesController.php
+1 -1
View File
@@ -42,7 +42,7 @@ class AdminProfilesControllerCore extends AdminController
'confirm' => $this->l('Delete selected items?'))
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_profile' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminQuickAccessesController.php
+1 -1
View File
@@ -44,7 +44,7 @@ class AdminQuickAccessesControllerCore extends AdminController
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_quick_access' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminRangePriceController.php
+1 -1
View File
@@ -37,7 +37,7 @@ class AdminRangePriceControllerCore extends AdminController
$this->addRowAction('delete');
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_range_price' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'carrier_name' => array('title' => $this->l('Carrier'), 'align' => 'left', 'width' => 'auto', 'filter_key' => 'ca!name'),
'delimiter1' => array('title' => $this->l('From'), 'width' => 86, 'type' => 'price', 'align' => 'right'),
controllers/admin/AdminRangeWeightController.php
+1 -1
View File
@@ -37,7 +37,7 @@ class AdminRangeWeightControllerCore extends AdminController
$this->addRowAction('delete');
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_range_weight' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'carrier_name' => array('title' => $this->l('Carrier'), 'align' => 'left', 'width' => 'auto', 'filter_key' => 'ca!name'),
'delimiter1' => array('title' => $this->l('From'), 'width' => 86, 'float' => true, 'suffix' => Configuration::get('PS_WEIGHT_UNIT'), 'align' => 'right'),
controllers/admin/AdminReferrersController.php
+1 -1
View File
@@ -59,7 +59,7 @@ class AdminReferrersControllerCore extends AdminController
{
$this->table = 'referrer';
$this->className = 'Referrer';
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_referrer' => array(
'title' => $this->l('ID'),
'width' => 25,
controllers/admin/AdminRequestSqlController.php
+1 -1
View File
@@ -45,7 +45,7 @@ class AdminRequestSqlControllerCore extends AdminController
$this->context = Context::getContext();
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_request_sql' => array('title' => $this->l('ID'), 'width' => 25),
'name' => array('title' => $this->l('Name'), 'width' => 300),
'sql' => array('title' => $this->l('Request'), 'width' => 500)
controllers/admin/AdminReturnController.php
+1 -1
View File
@@ -36,7 +36,7 @@ class AdminReturnControllerCore extends AdminController
$this->_select = 'orsl.`name`';
$this->_join = 'LEFT JOIN '._DB_PREFIX_.'order_return_state_lang orsl ON (orsl.`id_order_return_state` = a.`state` AND orsl.`id_lang` = '.(int)$this->context->language->id.')';
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_order_return' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'id_order' => array('title' => $this->l('Order ID'), 'width' => 100, 'align' => 'center'),
'name' => array('title' => $this->l('Status'), 'width' => 'auto', 'align' => 'left'),
controllers/admin/AdminScenesController.php
+1 -1
View File
@@ -41,7 +41,7 @@ class AdminScenesControllerCore extends AdminController
array('name' => 'thumb', 'dir' => 'scenes/thumbs')
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_scene' => array(
'title' => $this->l('ID'),
'align' => 'center',