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

// fix update view.tpl in AdminManufacturersController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9915 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-07 09:12:51 +00:00
parent c62eb897a5
commit edb2da2600
5 changed files with 127 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminManufacturersController.php
+46 -33
View File
@@ -109,14 +109,11 @@ class AdminManufacturersControllerCore extends AdminController
$this->context->smarty->assign('title_list', $this->l('List of manufacturers:'));
$this->initToolbar();
$this->content .= parent::initList();
}
public function initListManufacturerAddresses()
{
$this->toolbar_title = $this->l('Addresses');
// reset actions and query vars
$this->actions = array();
@@ -207,7 +204,6 @@ class AdminManufacturersControllerCore extends AdminController
$this->initListManufacturerAddresses();
}
/**
* Display editaddresses action link
* @param string $token the token to add to the link
@@ -226,7 +222,7 @@ class AdminManufacturersControllerCore extends AdminController
'action' => self::$cache_lang['editaddresses'],
));
return $this->context->smarty->fetch('manufacturers/list_action_edit_adresses.tpl');
return $this->context->smarty->fetch('helper/list/list_action_edit.tpl');
}
public function initForm()
@@ -523,6 +519,16 @@ class AdminManufacturersControllerCore extends AdminController
'alias' => 'manufacturer'
);
$this->toolbar_btn = array(
'save' => array(
'href' => '#',
'desc' => $this->l('Save')
),
'cancel' => array(
'href' => self::$currentIndex.'&token='.$this->token,
'desc' => $this->l('Cancel')
)
);
$this->getlanguages();
$helper = new HelperForm();
$helper->currentIndex = self::$currentIndex;
@@ -530,12 +536,12 @@ class AdminManufacturersControllerCore extends AdminController
$helper->table = $this->table;
$helper->identifier = $this->identifier;
$helper->id = $address->id;
$helper->toolbar_fix = true;
$helper->languages = $this->_languages;
$helper->default_form_language = $this->default_form_language;
$helper->allow_employee_form_lang = $this->allow_employee_form_lang;
$helper->fields_value = $this->getFieldsValue($address);
$helper->toolbar_btn = $this->toolbar_btn;
// $helper->tpl = 'manufacturers/form_addresses.tpl';
$this->content .= $helper->generateForm($this->fields_form);
}
@@ -580,11 +586,44 @@ class AdminManufacturersControllerCore extends AdminController
}
}
$this->context->smarty->assign(array(
$this->tpl_view_vars = array(
'manufacturer' => $manufacturer,
'addresses' => $addresses,
'products' => $products,
'stock_management' => Configuration::get('PS_STOCK_MANAGEMENT'),
);
return parent::initView();
}
public function initContent()
{
// toolbar (save, cancel, new, ..)
$this->initToolbar();
if ($this->display == 'editaddresses' || $this->display == 'addaddress')
$this->content .= $this->initFormAddress();
else if ($this->display == 'edit' || $this->display == 'add')
{
if (!$this->loadObject(true))
return;
$this->content .= $this->initForm();
}
else if ($this->display == 'view')
{
// Some controllers use the view action without an object
if ($this->className)
$this->loadObject(true);
$this->content .= $this->initView();
}
else if (!$this->ajax)
{
$this->content .= $this->initList();
$this->content .= $this->initOptions();
}
$this->context->smarty->assign(array(
'content' => $this->content,
'url_post' => self::$currentIndex.'&token='.$this->token,
));
}
@@ -620,32 +659,6 @@ class AdminManufacturersControllerCore extends AdminController
}
}
public function initContent()
{
if ($this->display == 'edit' || $this->display == 'add')
{
if (!($this->object = $this->loadObject(true)))
return;
$this->content .= $this->initForm();
}
else if ($this->display == 'editaddresses' || $this->display == 'addaddress')
$this->content .= $this->initFormAddress();
else if ($this->display == 'view')
$this->content .= $this->initView();
else
{
$this->content .= $this->initList();
$this->content .= $this->initOptions();
}
$this->context->smarty->assign(array(
'table' => $this->table,
'current' => self::$currentIndex,
'token' => $this->token,
'content' => $this->content
));
}
public function postProcess()
{
if (Tools::getValue('submitAddaddress') || Tools::isSubmit('deleteaddress'))