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

// Rename fieldsDisplay to fields_list part1 (timeout)

Browse Source
This commit is contained in:
tDidierjean
2012-03-29 16:26:54 +00:00
parent 35667bb439
commit 215ca93f95
13 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAddressesController.php
+1 -1
View File
@@ -52,7 +52,7 @@ class AdminAddressesControllerCore 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'), 'align' => 'center', 'width' => 25),
'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'),
'lastname' => array('title' => $this->l('Last name'), 'width' => 140, 'filter_key' => 'a!lastname'),
controllers/admin/AdminAttachmentsController.php
+1 -1
View File
@@ -39,7 +39,7 @@ class AdminAttachmentsControllerCore extends AdminController
$this->addRowAction('edit');
$this->addRowAction('delete');
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_attachment' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminAttributesGroupsController.php
+5 -5
View File
@@ -39,7 +39,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
$this->lang = true;
$this->_defaultOrderBy = 'position';
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_attribute_group' => array(
'title' => $this->l('ID'),
'width' => 25,
@@ -101,7 +101,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
if (!Validate::isLoadedObject($obj = new AttributeGroup((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_attribute' => array(
'title' => $this->l('ID'),
'width' => 40,
@@ -115,13 +115,13 @@ class AdminAttributesGroupsControllerCore extends AdminController
);
if ($obj->group_type == 'color')
$this->fieldsDisplay['color'] = array(
$this->fields_list['color'] = array(
'title' => $this->l('Color'),
'width' => 40,
'filter_key' => 'b!color'
);
$this->fieldsDisplay['position'] = array(
$this->fields_list['position'] = array(
'title' => $this->l('Position'),
'width' => 40,
'filter_key' => 'cp!position',
@@ -159,7 +159,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
$helper->show_toolbar = false;
$helper->bulk_actions = $this->bulk_actions;
$helper->position_identifier = 'id_attribute';
$content = $helper->generateList($this->_list, $this->fieldsDisplay);
$content = $helper->generateList($this->_list, $this->fields_list);
die (Tools::jsonEncode(array('use_parent_structure' => false, 'data' => $content)));
}
controllers/admin/AdminBackupController.php
+1 -1
View File
@@ -37,7 +37,7 @@ class AdminBackupControllerCore extends AdminController
$this->identifier = 'filename';
parent::__construct();
$this->fieldsDisplay = array (
$this->fields_list = array (
'date' => array('title' => $this->l('Date'), 'type' => 'datetime', 'width' => 120, 'align' => 'right'),
'age' => array('title' => $this->l('Age')),
'filename' => array('title' => $this->l('File name'), 'width' => 200),
controllers/admin/AdminCarriersController.php
+1 -1
View File
@@ -51,7 +51,7 @@ class AdminCarriersControllerCore extends AdminController
'dir' => 's'
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_carrier' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminCartRulesController.php
+1 -1
View File
@@ -36,7 +36,7 @@ class AdminCartRulesControllerCore extends AdminController
$this->addRowAction('edit');
$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_cart_rule' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'name' => array('title' => $this->l('Code')),
'priority' => array('title' => $this->l('Priority')),
controllers/admin/AdminCartsController.php
+1 -1
View File
@@ -44,7 +44,7 @@ class AdminCartsControllerCore extends AdminController
LEFT JOIN '._DB_PREFIX_.'orders o ON (o.id_cart = a.id_cart)
LEFT JOIN `'._DB_PREFIX_.'connections` co ON (a.id_guest = co.id_guest AND TIME_TO_SEC(TIMEDIFF(NOW(), co.`date_add`)) < 1800)';
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_cart' => array(
'title' => $this->l('ID'),
'align' => 'center',
controllers/admin/AdminCategoriesController.php
+2 -2
View File
@@ -47,7 +47,7 @@ class AdminCategoriesControllerCore extends AdminController
'dir' => 'c'
);
$this->fieldsDisplay = array(
$this->fields_list = array(
'id_category' => array(
'title' => $this->l('ID'),
'align' => 'center',
@@ -104,7 +104,7 @@ class AdminCategoriesControllerCore extends AdminController
// if we are not in a shop context, we remove the position column
if (Shop::getContext() != Shop::CONTEXT_SHOP)
unset($this->fieldsDisplay['position']);
unset($this->fields_list['position']);
// shop restriction : if category is not available for current shop, we redirect to the list from default category
if (!Shop::isCategoryAvailable($this->_category->id))
{
controllers/admin/AdminCmsCategoriesController.php
+1 -1
View File
@@ -42,7 +42,7 @@ class AdminCmsCategoriesControllerCore 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_cms_category' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 30),
'name' => array('title' => $this->l('Name'), 'width' => 'auto', 'callback' => 'hideCMSCategoryPosition', 'callback_object' => 'CMSCategory'),
'description' => array('title' => $this->l('Description'), 'width' => 500, 'maxlength' => 90, 'orderby' => false),
controllers/admin/AdminCmsController.php
+2 -2
View File
@@ -43,7 +43,7 @@ class AdminCmsControllerCore 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_cms' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'link_rewrite' => array('title' => $this->l('URL'), 'width' => 'auto'),
'meta_title' => array('title' => $this->l('Title'), 'width' => '300', 'filter_key' => 'b!meta_title'),
@@ -194,7 +194,7 @@ class AdminCmsControllerCore extends AdminController
/* Display list header (filtering, pagination and column names) */
$this->displayListHeader($token);
if (!count($this->_list))
echo '<tr><td class="center" colspan="'.(count($this->fieldsDisplay) + 2).'">'.$this->l('No items found').'</td></tr>';
echo '<tr><td class="center" colspan="'.(count($this->fields_list) + 2).'">'.$this->l('No items found').'</td></tr>';
/* Show the content of the table */
$this->displayListContent($token);
controllers/admin/AdminContactsController.php
+1 -1
View File
@@ -36,7 +36,7 @@ class AdminContactsControllerCore 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_contact' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
'name' => array('title' => $this->l('Title'), 'width' => 130),
'email' => array('title' => $this->l('E-mail address'), 'width' => 130),