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

// Added Helper::createTemplate()

Browse Source
This commit is contained in:
tDidierjean
2011-11-04 13:31:09 +00:00
parent e986eee78b
commit ad2db3a45b
10 changed files with 85 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAttributesGroupsController.php
+1 -1
View File
@@ -485,7 +485,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
{
/* Hook */
Hook::exec('actionObjectAttributeGroupAddBefore');
if (Tools::getValue('submitDel'.$this->table))
{
if ($this->tabAccess['delete'] === '1')
controllers/admin/AdminDbController.php
+5 -8
View File
@@ -58,14 +58,10 @@ class AdminDbControllerCore extends AdminController
public function initContent()
{
parent::initContent();
$this->warnings[] = $this->l('Be VERY CAREFUL with these settings, as changes may cause your PrestaShop online store to malfunction. For all issues, check the config/settings.inc.php file.');
$helper = new HelperOptions();
$helper->id = $this->id;
$helper->currentIndex = self::$currentIndex;
$this->content .= $helper->generateOptions($this->options);
$this->content .= $this->initToolbar();
$this->content .= $this->initOptions();
$table_status = $this->getTablesStatus();
foreach ($table_status as $key => $table)
@@ -76,6 +72,7 @@ class AdminDbControllerCore extends AdminController
'update_url' => self::$currentIndex.'&submitAdd'.$this->table.'=1&token='.$this->token,
'table_status' => $table_status,
'engines' => $this->getEngines(),
'content' => $this->content,
));
}
@@ -91,7 +88,7 @@ class AdminDbControllerCore extends AdminController
if ($this->action == 'update_options')
{
foreach ($this->optionsList['database']['fields'] AS $field => $values)
foreach ($this->options['database']['fields'] AS $field => $values)
if (isset($values['required']) AND $values['required'])
if (($value = Tools::getValue($field)) == false AND (string)$value != '0')
$this->_errors[] = Tools::displayError('field').' <b>'.$values['title'].'</b> '.Tools::displayError('is required.');
@@ -100,7 +97,7 @@ class AdminDbControllerCore extends AdminController
{
/* Datas are not saved in database but in config/settings.inc.php */
$settings = array();
foreach ($this->optionsList['database']['fields'] as $k => $data)
foreach ($this->options['database']['fields'] as $k => $data)
if ($value = Tools::getValue($k))
$settings['_'.Tools::strtoupper($k).'_'] = $value;
controllers/admin/AdminDeliverySlipController.php
+1 -3
View File
@@ -117,9 +117,7 @@ class AdminDeliverySlipControllerCore extends AdminController
{
$this->initForm();
$helper = new HelperForm();
// Check if form template has been overriden
if (file_exists($this->context->smarty->template_dir[0].'/'.$this->tpl_folder.'form.tpl'))
$helper->tpl = $this->tpl_folder.'form.tpl';
$helper->override_folder = $this->tpl_folder;
$helper->currentIndex = self::$currentIndex;
$helper->token = $this->token;
$helper->table = $this->table;
controllers/admin/AdminTaxRulesGroupController.php
+2 -4
View File
@@ -124,7 +124,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
t.rate';
$this->_join = '
LEFT JOIN `'._DB_PREFIX_.'country_lang` c
LEFT JOIN `'._DB_PREFIX_.'country_lang` c
ON (a.`id_country` = c.`id_country` AND id_lang = '.(int)$this->context->language->id.')
LEFT JOIN `'._DB_PREFIX_.'state` s
ON (a.`id_state` = s.`id_state`)
@@ -332,9 +332,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
$this->getlanguages();
$helper = new HelperForm();
// Check if form template has been overriden
if (file_exists($this->context->smarty->template_dir[0].'/'.$this->tpl_folder.'form.tpl'))
$helper->setTpl($this->tpl_folder.'form.tpl');
$helper->override_tpl = $this->tpl_folder;
$helper->currentIndex = self::$currentIndex;
$helper->token = $this->token;
$helper->table = 'tax_rule';