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

// Renaming options to fields_options

Browse Source
This commit is contained in:
tDidierjean
2012-03-29 16:14:14 +00:00
parent 69afa5719d
commit e0664df6f8
31 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+4 -4
View File
@@ -831,7 +831,7 @@ class AdminControllerCore extends Controller
$languages = Language::getLanguages(false);
foreach ($this->options as $category_data)
foreach ($this->fields_options as $category_data)
{
if (!isset($category_data['fields']))
continue;
@@ -1459,7 +1459,7 @@ class AdminControllerCore extends Controller
*/
public function renderOptions()
{
if ($this->options && is_array($this->options))
if ($this->fields_options && is_array($this->fields_options))
{
if ($this->display != 'options')
$this->show_toolbar = false;
@@ -1468,7 +1468,7 @@ class AdminControllerCore extends Controller
$this->setHelperDisplay($helper);
$helper->id = $this->id;
$helper->tpl_vars = $this->tpl_option_vars;
$options = $helper->generateOptions($this->options);
$options = $helper->generateOptions($this->fields_options);
return $options;
}
@@ -1849,7 +1849,7 @@ class AdminControllerCore extends Controller
break;
}
}
elseif (!empty($this->options) && empty($this->fieldsDisplay))
elseif (!empty($this->fields_options) && empty($this->fieldsDisplay))
$this->display = 'options';
}
controllers/admin/AdminAdminPreferencesController.php
+1 -1
View File
@@ -41,7 +41,7 @@ class AdminAdminPreferencesControllerCore extends AdminController
$upload_mb = min($max_upload, $max_post);
// Options list
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('General'),
'icon' => 'tab-preferences',
controllers/admin/AdminBackupController.php
+1 -1
View File
@@ -46,7 +46,7 @@ class AdminBackupControllerCore extends AdminController
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Backup options'),
'fields' => array(
controllers/admin/AdminCarriersController.php
+1 -1
View File
@@ -113,7 +113,7 @@ class AdminCarriersControllerCore extends AdminController
array('value' => Carrier::SORT_BY_DESC, 'name' => $this->l('Descending'))
);
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Carrier options'),
'fields' => array(
controllers/admin/AdminCountriesController.php
+1 -1
View File
@@ -52,7 +52,7 @@ class AdminCountriesControllerCore extends AdminController
'dir' => 'st'
);
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Country options'),
'fields' => array(
controllers/admin/AdminCurrenciesController.php
+1 -1
View File
@@ -53,7 +53,7 @@ class AdminCurrenciesControllerCore extends AdminController
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->options = array(
$this->fields_options = array(
'change' => array(
'title' => $this->l('Currency rates'),
'image' => '../img/admin/exchangesrate.gif',
controllers/admin/AdminCustomerPreferencesController.php
+1 -1
View File
@@ -45,7 +45,7 @@ class AdminCustomerPreferencesControllerCore extends AdminController
)
);
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('General'),
'icon' => 'tab-preferences',
controllers/admin/AdminCustomerThreadsController.php
+1 -1
View File
@@ -129,7 +129,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
$this->shopLinkType = 'shop';
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Customer service options'),
'fields' => array(
controllers/admin/AdminDeliverySlipController.php
+1 -1
View File
@@ -33,7 +33,7 @@ class AdminDeliverySlipControllerCore extends AdminController
$this->context = Context::getContext();
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Delivery slip options'),
'fields' => array(
controllers/admin/AdminEmailsController.php
+1 -1
View File
@@ -37,7 +37,7 @@ class AdminEmailsControllerCore extends AdminController
foreach (Contact::getContacts($this->context->language->id) as $contact)
$arr[] = array('email_message' => $contact['id_contact'], 'name' => $contact['name']);
$this->options = array(
$this->fields_options = array(
'email' => array(
'title' => $this->l('E-mail'),
'icon' => 'email',
controllers/admin/AdminEmployeesController.php
+1 -1
View File
@@ -80,7 +80,7 @@ class AdminEmployeesControllerCore extends AdminController
'active' => array('title' => $this->l('Can log in'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'width' => 30),
);
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Employee options'),
'fields' => array(
controllers/admin/AdminGeolocationController.php
+2 -2
View File
@@ -31,7 +31,7 @@ class AdminGeolocationControllerCore extends AdminController
{
parent::__construct();
$this->options = array(
$this->fields_options = array(
'geolocationConfiguration' => array(
'title' => $this->l('Geolocation by IP address:'),
'icon' => 'world',
@@ -121,7 +121,7 @@ class AdminGeolocationControllerCore extends AdminController
public function renderOptions()
{
// This field is not declared in class constructor because we want it to be manually post processed
$this->options['geolocationCountries']['fields']['countries'] = array(
$this->fields_options['geolocationCountries']['fields']['countries'] = array(
'title' => $this->l('Select countries that can access your store:'),
'type' => 'checkbox_table',
'identifier' => 'iso_code',
controllers/admin/AdminImagesController.php
+1 -1
View File
@@ -46,7 +46,7 @@ class AdminImagesControllerCore extends AdminController
'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5)
);
$this->options = array(
$this->fields_options = array(
'images' => array(
'title' => $this->l('Images'),
'icon' => 'tab-orders',
controllers/admin/AdminInvoicesController.php
+1 -1
View File
@@ -33,7 +33,7 @@ class AdminInvoicesControllerCore extends AdminController
parent::__construct();
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Invoice options'),
'fields' => array(
controllers/admin/AdminLocalizationController.php
+2 -2
View File
@@ -34,7 +34,7 @@ class AdminLocalizationControllerCore extends AdminController
parent::__construct();
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Configuration'),
'fields' => array(
@@ -130,7 +130,7 @@ class AdminLocalizationControllerCore extends AdminController
);
if (function_exists('date_default_timezone_set'))
$this->options['general']['fields']['PS_TIMEZONE'] = array(
$this->fields_options['general']['fields']['PS_TIMEZONE'] = array(
'title' => $this->l('Time Zone.'),
'validation' => 'isAnything',
'type' => 'select',
controllers/admin/AdminLogsController.php
+1 -1
View File
@@ -47,7 +47,7 @@ class AdminLogsControllerCore extends AdminController
'date_add' => array('title' => $this->l('Date'), 'width' => 150, 'align' => 'right', 'type' => 'datetime')
);
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Logs by e-mail'),
'fields' => array(
controllers/admin/AdminMaintenanceController.php
+1 -1
View File
@@ -34,7 +34,7 @@ class AdminMaintenanceControllerCore extends AdminController
parent::__construct();
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('General'),
'icon' => 'tab-preferences',
controllers/admin/AdminMetaController.php
+4 -4
View File
@@ -113,7 +113,7 @@ class AdminMetaControllerCore extends AdminController
$robots_options['submit'] = $robots_submit;
// List of options
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Set up URLs'),
'description' => $url_description,
@@ -154,7 +154,7 @@ class AdminMetaControllerCore extends AdminController
foreach (Dispatcher::getInstance()->default_routes[$routeID]['keywords'] as $keyword => $data)
$keywords[] = ((isset($data['param'])) ? '<span class="red">'.$keyword.'*</span>' : $keyword);
$this->options['routes']['fields']['PS_ROUTE_'.$routeID] = array(
$this->fields_options['routes']['fields']['PS_ROUTE_'.$routeID] = array(
'title' => $title,
'desc' => sprintf($this->l('Keywords: %s'), implode(', ', $keywords)),
'validation' => 'isString',
@@ -418,7 +418,7 @@ class AdminMetaControllerCore extends AdminController
if (Configuration::get('PS_REWRITING_SETTINGS'))
$this->addAllRouteFields();
if ($this->options && is_array($this->options))
if ($this->fields_options && is_array($this->fields_options))
{
$helper = new HelperOptions($this);
$this->setHelperDisplay($helper);
@@ -429,7 +429,7 @@ class AdminMetaControllerCore extends AdminController
));
$helper->id = $this->id;
$helper->tpl_vars = $this->tpl_option_vars;
$options = $helper->generateOptions($this->options);
$options = $helper->generateOptions($this->fields_options);
return $options;
}
controllers/admin/AdminOrderPreferencesController.php
+1 -1
View File
@@ -59,7 +59,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
foreach (Tax::getTaxes($this->context->language->id) as $tax)
$taxes[] = array('id' => $tax['id_tax'], 'name' => $tax['name']);
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('General'),
'icon' => 'tab-preferences',
controllers/admin/AdminPPreferencesController.php
+1 -1
View File
@@ -34,7 +34,7 @@ class AdminPPreferencesControllerCore extends AdminController
parent::__construct();
$this->options = array(
$this->fields_options = array(
'products' => array(
'title' => $this->l('Products (general)'),
'fields' => array(
controllers/admin/AdminPreferencesController.php
+1 -1
View File
@@ -98,7 +98,7 @@ class AdminPreferencesControllerCore extends AdminController
$this->l('Please click here to use HTTPS protocol before enabling SSL.').'</a>';
}
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('General'),
'icon' => 'tab-preferences',
controllers/admin/AdminRequestSqlController.php
+1 -1
View File
@@ -51,7 +51,7 @@ class AdminRequestSqlControllerCore extends AdminController
'sql' => array('title' => $this->l('Request'), 'width' => 500)
);
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Settings'),
'fields' => array(
controllers/admin/AdminReturnController.php
+1 -1
View File
@@ -43,7 +43,7 @@ class AdminReturnControllerCore extends AdminController
'date_add' => array('title' => $this->l('Date issued'), 'width' => 150, 'type' => 'date', 'align' => 'right'),
);
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Merchandise return (RMA) options'),
'fields' => array(
controllers/admin/AdminSearchConfController.php
+3 -3
View File
@@ -60,7 +60,7 @@ class AdminSearchConfControllerCore extends AdminController
'searchcron.php?full=1&token='.substr(_COOKIE_KEY_, 34, 8);
list($total, $indexed) = Db::getInstance()->getRow('SELECT COUNT(*) as "0", SUM(indexed) as "1" FROM '._DB_PREFIX_.'product');
$this->options = array(
$this->fields_options = array(
'indexation' => array(
'title' => $this->l('Indexation'),
'icon' => 'search',
@@ -201,7 +201,7 @@ class AdminSearchConfControllerCore extends AdminController
*/
public function renderOptions()
{
if ($this->options && is_array($this->options))
if ($this->fields_options && is_array($this->fields_options))
{
$helper = new HelperOptions($this);
$this->setHelperDisplay($helper);
@@ -212,7 +212,7 @@ class AdminSearchConfControllerCore extends AdminController
));
$helper->id = $this->id;
$helper->tpl_vars = $this->tpl_option_vars;
$options = $helper->generateOptions($this->options);
$options = $helper->generateOptions($this->fields_options);
return $options;
}
controllers/admin/AdminShippingController.php
+1 -1
View File
@@ -39,7 +39,7 @@ class AdminShippingControllerCore extends AdminController
if ($carrier['is_free'])
unset($carriers[$key]);
$this->options = array(
$this->fields_options = array(
'handling' => array(
'title' => $this->l('Handling'),
'icon' => 'delivery',
controllers/admin/AdminShopController.php
+1 -1
View File
@@ -74,7 +74,7 @@ class AdminShopControllerCore extends AdminController
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?')));
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Shops options'),
'fields' => array(
controllers/admin/AdminStockConfigurationController.php
+1 -1
View File
@@ -80,7 +80,7 @@ class AdminStockConfigurationControllerCore extends AdminController
array(Configuration::get('PS_STOCK_MVT_TRANSFER_FROM')), -1);
// defines options for StockMvt
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Options'),
'fields' => array(
controllers/admin/AdminStoresController.php
+2 -2
View File
@@ -60,7 +60,7 @@ class AdminStoresControllerCore extends AdminController
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Parameters'),
'fields' => array(
@@ -523,7 +523,7 @@ class AdminStoresControllerCore extends AdminController
if (!isset($fields[$key]))
$fields[$key] = $formFields[$key];
$this->options['contact'] = array(
$this->fields_options['contact'] = array(
'title' => $this->l('Contact details'),
'icon' => 'tab-contact',
'fields' => $fields,
controllers/admin/AdminTaxesController.php
+2 -2
View File
@@ -46,7 +46,7 @@ class AdminTaxesControllerCore extends AdminController
if (Configuration::get('PS_USE_ECOTAX'))
$ecotax_desc = $this->l('If you disable the ecotax, the ecotax for all your products will be set to 0');
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Tax options'),
'fields' => array(
@@ -60,7 +60,7 @@ class AdminTaxesControllerCore extends AdminController
);
if (Configuration::get('PS_USE_ECOTAX'))
$this->options['general']['fields']['PS_ECOTAX_TAX_RULES_GROUP_ID'] = array('title' => $this->l('Ecotax:'), 'desc' => $this->l('The tax to apply on the ecotax (e.g. French ecotax: 19.6%).'),
$this->fields_options['general']['fields']['PS_ECOTAX_TAX_RULES_GROUP_ID'] = array('title' => $this->l('Ecotax:'), 'desc' => $this->l('The tax to apply on the ecotax (e.g. French ecotax: 19.6%).'),
'cast' => 'intval', 'type' => 'select', 'identifier' => 'id_tax', 'identifier' => 'id_tax_rules_group', 'list' => TaxRulesGroup::getTaxRulesGroupsForOptions());
parent::__construct();
controllers/admin/AdminThemesController.php
+3 -3
View File
@@ -99,7 +99,7 @@ class AdminThemesControllerCore extends AdminController
$this->can_display_themes = (!Shop::isFeatureActive() || Shop::getContext() == Shop::CONTEXT_SHOP) ? true : false;
$this->options = array(
$this->fields_options = array(
'theme' => array(
'title' => sprintf($this->l('Select theme for shop %s'), $this->context->shop->name),
'description' => (!$this->can_display_themes) ? $this->l('You must select a shop from the above list if you want to select a theme') : '',
@@ -640,7 +640,7 @@ class AdminThemesControllerCore extends AdminController
*/
public function renderOptions()
{
if ($this->options && is_array($this->options))
if ($this->fields_options && is_array($this->fields_options))
{
$helper = new HelperOptions($this);
$this->setHelperDisplay($helper);
@@ -652,7 +652,7 @@ class AdminThemesControllerCore extends AdminController
));
$helper->id = $this->id;
$helper->tpl_vars = $this->tpl_option_vars;
$options = $helper->generateOptions($this->options);
$options = $helper->generateOptions($this->fields_options);
return $options;
}
controllers/admin/AdminWebserviceController.php
+3 -4
View File
@@ -62,7 +62,7 @@ class AdminWebserviceControllerCore extends AdminController
);
if (file_exists(_PS_ROOT_DIR_.'/.htaccess'))
$this->options = array(
$this->fields_options = array(
'general' => array(
'title' => $this->l('Configuration'),
'fields' => array(
@@ -182,7 +182,7 @@ class AdminWebserviceControllerCore extends AdminController
*/
public function renderOptions()
{
if ($this->options && is_array($this->options))
if ($this->fields_options && is_array($this->fields_options))
{
$helper = new HelperOptions($this);
$this->setHelperDisplay($helper);
@@ -193,7 +193,7 @@ class AdminWebserviceControllerCore extends AdminController
));
$helper->id = $this->id;
$helper->tpl_vars = $this->tpl_option_vars;
$options = $helper->generateOptions($this->options);
$options = $helper->generateOptions($this->fields_options);
return $options;
}
@@ -207,7 +207,6 @@ class AdminWebserviceControllerCore extends AdminController
$this->display = '';
}
public function postProcess()
{
if (Tools::getValue('key') && strlen(Tools::getValue('key')) < 32)