// Rename fieldsDisplay to fields_list part3 (timeout)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14378 b9a71923-0436-4b27-9f14-aed3839534dd

controllers/admin/AdminSearchConfController.php

@@ -47,7 +47,7 @@ class AdminSearchConfControllerCore 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(
 			'alias' => array('title' => $this->l('Aliases'), 'width' => 'auto'),
 			'search' => array('title' => $this->l('Search'), 'width' => 100),
 			'active' => array('title' => $this->l('Status'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)

controllers/admin/AdminSearchController.php

@@ -189,7 +189,7 @@ class AdminSearchControllerCore extends AdminController
 			$genders_icon[$gender->id] = '../genders/'.(int)$gender->id.'.jpg';
 			$genders[$gender->id] = $gender->name;
 		}
-		$this->fieldsDisplay['customers'] = (array(
+		$this->fields_list['customers'] = (array(
 			'id_customer' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
 			'id_gender' => array('title' => $this->l('Gender'), 'align' => 'center', 'icon' => $genders_icon, 'list' => $genders, 'width' => 25),
 			'firstname' => array('title' => $this->l('First Name'), 'align' => 'left', 'width' => 150),
@@ -205,7 +205,7 @@ class AdminSearchControllerCore extends AdminController
 	protected function initProductList()
 	{
 		$this->show_toolbar = false;
-		$this->fieldsDisplay['products'] = (array(
+		$this->fields_list['products'] = (array(
 			'id_product' => array('title' => $this->l('ID'), 'width' => 25),
 			'manufacturer_name' => array('title' => $this->l('Manufacturer'), 'align' => 'center', 'width' => 200),
 			'reference' => array('title' => $this->l('Reference'), 'align' => 'center', 'width' => 150),
@@ -266,7 +266,7 @@ class AdminSearchControllerCore extends AdminController
 				$helper->token = Tools::getAdminTokenLite('AdminProducts');
 
 				if ($this->_list['products'])
-					$view = $helper->generateList($this->_list['products'], $this->fieldsDisplay['products']);
+					$view = $helper->generateList($this->_list['products'], $this->fields_list['products']);
 
 				$this->tpl_view_vars['products'] = $view;
 			}
@@ -289,7 +289,7 @@ class AdminSearchControllerCore extends AdminController
 				{
 					foreach ($this->_list['customers'] as $key => $val)
 						$this->_list['customers'][$key]['orders'] = Order::getCustomerNbOrders((int)$val['id_customer']);
-					$view = $helper->generateList($this->_list['customers'], $this->fieldsDisplay['customers']);
+					$view = $helper->generateList($this->_list['customers'], $this->fields_list['customers']);
 				}
 				$this->tpl_view_vars['customers'] = $view;
 			}

controllers/admin/AdminSearchEnginesController.php

@@ -44,7 +44,7 @@ class AdminSearchEnginesControllerCore 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_search_engine' => array('title' => $this->l('ID'), 'width' => 25),
 			'server' => array('title' => $this->l('Server')),
 			'getvar' => array('title' => $this->l('GET variable'), 'width' => 100)

controllers/admin/AdminShopController.php

@@ -35,7 +35,7 @@ class AdminShopControllerCore extends AdminController
 		$this->className = 'Shop';
 		$this->multishop_context = Shop::CONTEXT_ALL | Shop::CONTEXT_GROUP;
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_shop' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',

controllers/admin/AdminShopUrlController.php

@@ -40,7 +40,7 @@ class AdminShopUrlControllerCore extends AdminController
 		if (!Tools::getValue('realedit'))
 			$this->deleted = false;
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_shop_url' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',

controllers/admin/AdminSlipController.php

@@ -32,7 +32,7 @@ class AdminSlipControllerCore extends AdminController
 	 	$this->table = 'order_slip';
 		$this->className = 'OrderSlip';
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_order_slip' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',

controllers/admin/AdminSpecificPriceRuleController.php

@@ -53,7 +53,7 @@ class AdminSpecificPriceRuleControllerCore 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_specific_price_rule' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',

controllers/admin/AdminStatesController.php

@@ -49,7 +49,7 @@ class AdminStatesControllerCore extends AdminController
 									'text' => $this->l('Affect a new zone'))
 								);
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_state' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',

controllers/admin/AdminStatusesController.php

@@ -49,7 +49,7 @@ class AdminStatusesControllerCore extends AdminController
 			'dir' => 'os'
 		);
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_order_state' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',
@@ -112,7 +112,7 @@ class AdminStatusesControllerCore extends AdminController
 
 		// reset actions and query vars
 		$this->actions = array();
-		unset($this->fieldsDisplay, $this->_select, $this->_join, $this->_group, $this->_filterHaving, $this->_filter, $this->identifier);
+		unset($this->fields_list, $this->_select, $this->_join, $this->_group, $this->_filterHaving, $this->_filter, $this->identifier);
 
 		$this->table = 'order_return_state';
 		$this->_defaultOrderBy = $this->identifier = 'id_order_return_state';
@@ -133,7 +133,7 @@ class AdminStatusesControllerCore extends AdminController
 		else
 			$this->action = '';
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_order_return_state' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',

controllers/admin/AdminStockConfigurationController.php

@@ -42,7 +42,7 @@ class AdminStockConfigurationControllerCore extends AdminController
 		$this->multishop_context = Shop::CONTEXT_ALL;
 
 		// defines fields
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_stock_mvt_reason' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',
@@ -437,7 +437,7 @@ class AdminStockConfigurationControllerCore extends AdminController
 		$this->toolbar_title = $this->l('Stock: Supply Order status');
 		$this->initToolbar();
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'name' => array(
 				'title' => $this->l('Name'),
 				'color' => 'color',
@@ -538,7 +538,7 @@ class AdminStockConfigurationControllerCore extends AdminController
 		parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop);
 
 		//If there is a field product_name in the list, check if this field is null and display standard message
-		foreach ($this->fieldsDisplay as $key => $value)
+		foreach ($this->fields_list as $key => $value)
 			if ($key == 'product_name')
 			{
 				$nb_items = count($this->_list);

controllers/admin/AdminStockCoverController.php

@@ -42,7 +42,7 @@ class AdminStockCoverControllerCore extends AdminController
 		$this->colorOnBackground = true;
 		$this->multishop_context = Shop::CONTEXT_ALL;
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'reference' => array(
 				'title' => $this->l('Reference'),
 				'align' => 'center',
@@ -168,7 +168,7 @@ class AdminStockCoverControllerCore extends AdminController
 					$data['qty_sold'] = $qty_sold;
 			}
 
-			echo Tools::jsonEncode(array('data'=> $datas, 'fields_display' => $this->fieldsDisplay));
+			echo Tools::jsonEncode(array('data'=> $datas, 'fields_display' => $this->fields_list));
 		}
 		die;
 	}

controllers/admin/AdminStockInstantStateController.php

@@ -40,7 +40,7 @@ class AdminStockInstantStateControllerCore extends AdminController
 		$this->lang = false;
 		$this->multishop_context = Shop::CONTEXT_ALL;
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'reference' => array(
 				'title' => $this->l('Reference'),
 				'align' => 'center',
@@ -331,7 +331,7 @@ class AdminStockInstantStateControllerCore extends AdminController
 				}
 			}
 
-			echo Tools::jsonEncode(array('data'=> $datas, 'fields_display' => $this->fieldsDisplay));
+			echo Tools::jsonEncode(array('data'=> $datas, 'fields_display' => $this->fields_list));
 		}
 		die;
 	}

controllers/admin/AdminStockManagementController.php

@@ -38,7 +38,7 @@ class AdminStockManagementControllerCore extends AdminController
 		$this->lang = true;
 		$this->multishop_context = Shop::CONTEXT_ALL;
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'reference' => array(
 				'title' => $this->l('Product reference'),
 				'align' => 'center',
@@ -836,7 +836,7 @@ class AdminStockManagementControllerCore extends AdminController
 			$helper->identifier = $this->identifier;
 			// Force render - no filter, form, js, sorting ...
 			$helper->simple_header = true;
-			$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));
 		}

controllers/admin/AdminStockMvtController.php

@@ -42,7 +42,7 @@ class AdminStockMvtControllerCore extends AdminController
 		$this->list_no_link = true;
 		$this->displayInformation($this->l('This interface allows you to display the stock movement for a selected warehouse.').'<br />');
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'product_reference' => array(
 				'title' => $this->l('Reference'),
 				'width' => 100,
@@ -225,7 +225,7 @@ class AdminStockMvtControllerCore extends AdminController
 		parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop);
 
 		//If there is a field product_name in the list, check if this field is null and display standard message
-		foreach ($this->fieldsDisplay as $key => $value)
+		foreach ($this->fields_list as $key => $value)
 			if ($key == 'product_name')
 			{
 				$nb_items = count($this->_list);

controllers/admin/AdminStoresController.php

@@ -45,7 +45,7 @@ class AdminStoresControllerCore extends AdminController
 			'dir' => 'st'
 		);
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_store' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
 			'name' => array('title' => $this->l('Name'), 'width' => 120, 'filter_key' => 'a!name'),
 			'address1' => array('title' => $this->l('Address'), 'width' => 120, 'filter_key' => 'a!address1'),

controllers/admin/AdminSuppliersController.php

@@ -43,7 +43,7 @@ class AdminSuppliersControllerCore extends AdminController
 
 		$this->fieldImageSettings = array('name' => 'logo', 'dir' => 'su');
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_supplier' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
 			'logo' => array('title' => $this->l('Logo'), 'width' => 150, 'align' => 'center', 'image' => 'su', 'orderby' => false, 'search' => false),
 			'name' => array('title' => $this->l('Name'), 'width' => 'auto'),

controllers/admin/AdminSupplyOrdersController.php

@@ -53,7 +53,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 		$this->addRowAction('details');
 		$this->list_no_link = true;
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'reference' => array(
 				'title' => $this->l('Reference'),
 				'width' => 250,
@@ -493,13 +493,13 @@ class AdminSupplyOrdersControllerCore extends AdminController
 		$this->addRowAction('createsupplyorder');
 		$this->addRowAction('delete');
 		// unsets some fields
-		unset($this->fieldsDisplay['state'],
+		unset($this->fields_list['state'],
-			  $this->fieldsDisplay['date_upd'],
+			  $this->fields_list['date_upd'],
-			  $this->fieldsDisplay['id_pdf'],
+			  $this->fields_list['id_pdf'],
-			  $this->fieldsDisplay['date_delivery_expected'],
+			  $this->fields_list['date_delivery_expected'],
-			  $this->fieldsDisplay['id_export']);
+			  $this->fields_list['id_export']);
 
-		// $this->fieldsDisplay['date_add']['align'] = 'left';
+		// $this->fields_list['date_add']['align'] = 'left';
 
 		// adds filter, to gets only templates
 		unset($this->_where);
@@ -691,8 +691,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
 		if (!Validate::isLoadedObject($supply_order))
 			return parent::initContent();
 
-		// re-defines fieldsDisplay
+		// re-defines fields_list
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'supplier_reference' => array(
 				'title' => $this->l('Supplier Reference'),
 				'align' => 'left',
@@ -789,7 +789,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 		$this->lang = false;
 		$lang_id = (int)$this->context->language->id; //employee lang
 
-		// gets values corresponding to fieldsDisplay
+		// gets values corresponding to fields_list
 		$this->_select = '
 			a.id_supply_order_detail as id,
 			a.quantity_received as quantity_received,
@@ -831,7 +831,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 		$this->displayInformation($this->l('Please not that a green line means that you received what you expected, and a red line means that you received more than expected.').'<br />');
 
 		// generates content
-		$content = $helper->generateList($this->_list, $this->fieldsDisplay);
+		$content = $helper->generateList($this->_list, $this->fields_list);
 
 		// assigns var
 		$this->context->smarty->assign(array(
@@ -1482,9 +1482,9 @@ class AdminSupplyOrdersControllerCore extends AdminController
 			// gets supply order id
 			$id_supply_order = (int)Tools::getValue('id');
 
-			// creates new fieldsDisplay
+			// creates new fields_list
-			unset($this->fieldsDisplay);
+			unset($this->fields_list);
-			$this->fieldsDisplay = array(
+			$this->fields_list = array(
 				'history_date' => array(
 					'title' => $this->l('Last update'),
 					'width' => 50,
@@ -1538,7 +1538,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 			$helper->identifier = $this->identifier;
 			//$helper->colorOnBackground = true;
 			$helper->simple_header = true;
-			$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));
 		}
@@ -1551,8 +1551,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
 			$lang_id = (int)$this->context->language->id;
 			$id_supply_order_detail = (int)Tools::getValue('id');
 
-			unset($this->fieldsDisplay);
+			unset($this->fields_list);
-			$this->fieldsDisplay = array(
+			$this->fields_list = array(
 				'date_add' => array(
 					'title' => $this->l('Last update'),
 					'width' => 50,
@@ -1591,7 +1591,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 			$helper->identifier = $this->identifier;
 			$helper->colorOnBackground = true;
 			$helper->simple_header = true;
-			$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));
 		}
@@ -1717,8 +1717,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
 				$this->toolbar_title = sprintf($this->l('Details on supply order #%s'), $supply_order->reference);
 			else
 				$this->toolbar_title = sprintf($this->l('Details on supply order template #%s'), $supply_order->reference);
-			// re-defines fieldsDisplay
+			// re-defines fields_list
-			$this->fieldsDisplay = array(
+			$this->fields_list = array(
 				'supplier_reference' => array(
 					'title' => $this->l('Supplier Reference'),
 					'align' => 'center',
@@ -1865,7 +1865,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 			$helper->show_toolbar = false;
 			$helper->toolbar_btn = $this->toolbar_btn;
 
-			$content = $helper->generateList($this->_list, $this->fieldsDisplay);
+			$content = $helper->generateList($this->_list, $this->fields_list);
 
 			// display these global order informations
 			$this->tpl_view_vars = array(

controllers/admin/AdminTabsController.php

@@ -43,7 +43,7 @@ class AdminTabsControllerCore extends AdminController
 
 		$this->imageType = 'gif';
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_tab' => array(
 				'title' => $this->l('ID'),
 				'width' => 25
@@ -231,7 +231,7 @@ class AdminTabsControllerCore extends AdminController
 			$helper->position_identifier = $this->position_identifier;
 			// Force render - no filter, form, js, sorting ...
 			$helper->simple_header = true;
-			$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));
 		}

controllers/admin/AdminTagsController.php

@@ -32,7 +32,7 @@ class AdminTagsControllerCore extends AdminController
 		$this->table = 'tag';
 		$this->className = 'Tag';
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_tag' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',

controllers/admin/AdminTaxRulesGroupController.php

@@ -40,7 +40,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
 
 		$this->context = Context::getContext();
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_tax_rules_group' => array(
 				'title' => $this->l('ID'),
 				'width' => 25
@@ -82,7 +82,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
 		$this->toolbar_btn = null;
 		$this->list_no_link = true;
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'country_name' => array(
 				'title' => $this->l('Country'),
 				'width' => 140

controllers/admin/AdminTaxesController.php

@@ -36,7 +36,7 @@ class AdminTaxesControllerCore 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_tax' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
 		'name' => array('title' => $this->l('Name'), 'width' => 'auto'),
 		'rate' => array('title' => $this->l('Rate'), 'align' => 'center', 'suffix' => '%', 'width' => 50),

controllers/admin/AdminThemesController.php

@@ -164,7 +164,7 @@ class AdminThemesControllerCore extends AdminController
 			),
 		);
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_theme' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',

controllers/admin/AdminTrackingController.php

@@ -83,7 +83,7 @@ class AdminTrackingControllerCore extends AdminController
 		$this->addRowActionSkipList('delete', array(Category::getTopCategory()->id));
 		$this->addRowActionSkipList('edit', array(Category::getTopCategory()->id));
 
-		$this->fieldsDisplay = (array(
+		$this->fields_list = (array(
 			'id_category' => array('title' => $this->l('ID'), 'width' => 50),
 			'name' => array('title' => $this->l('Name')),
 			'description' => array('title' => $this->l('Description')),
@@ -119,7 +119,7 @@ class AdminTrackingControllerCore extends AdminController
 		$this->addRowAction('edit');
 		$this->addRowAction('delete');
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_product' => array('title' => $this->l('ID'), 'width' => 50),
 			'reference' => array('title' => $this->l('Reference'), 'width' => 150),
 			'name' => array('title' => $this->l('Name')),
@@ -160,7 +160,7 @@ class AdminTrackingControllerCore extends AdminController
 		$this->addRowAction('edit');
 		$this->addRowAction('delete');
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_product' => array('title' => $this->l('ID'), 'width' => 50),
 			'reference' => array('title' => $this->l('Reference'), 'width' => 150),
 			'name' => array('title' => $this->l('Name')),
@@ -201,7 +201,7 @@ class AdminTrackingControllerCore extends AdminController
 		$this->addRowAction('edit');
 		$this->addRowAction('delete');
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_product' => array('title' => $this->l('ID'), 'width' => 50),
 			'reference' => array('title' => $this->l('Reference'), 'width' => 150),
 			'name' => array('title' => $this->l('Name'))

controllers/admin/AdminWarehousesController.php

@@ -37,7 +37,7 @@ class AdminWarehousesControllerCore extends AdminController
 		$this->deleted = true;
 		$this->lang = false;
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'reference'	=> array(
 				'title' => $this->l('Reference'),
 				'width' => 150,

controllers/admin/AdminWebserviceController.php

@@ -40,7 +40,7 @@ class AdminWebserviceControllerCore extends AdminController
 	 	$this->delete = true;
  		$this->id_lang_default = Configuration::get('PS_LANG_DEFAULT');
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'key' => array(
 				'title' => $this->l('Key'),
 				'align' => 'center',

controllers/admin/AdminZonesController.php

@@ -35,7 +35,7 @@ class AdminZonesControllerCore extends AdminController
 		$this->className = 'Zone';
 	 	$this->lang = false;
 
-		$this->fieldsDisplay = array(
+		$this->fields_list = array(
 			'id_zone' => array(
 				'title' => $this->l('ID'),
 				'align' => 'center',