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

[*] BO #PSFV-94 : update of the displayform method by helperForm in AdminStoresController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9401 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-10-17 16:37:21 +00:00
parent 651e2d72b9
commit 96844f2d92
6 changed files with 859 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+5 -3
View File
@@ -971,6 +971,7 @@ class AdminControllerCore extends Controller
else if ($this->display == 'list')
{
$this->getList($this->context->language->id);
$helper = new HelperList();
// Check if list templates have been overriden
if (file_exists($this->context->smarty->template_dir.'/'.$this->tpl_folder.'list_header.tpl'))
@@ -1004,9 +1005,9 @@ class AdminControllerCore extends Controller
$helper->identifier = $this->identifier;
$helper->token = $this->token;
$helper->imageType = $this->imageType;
$helper->no_add = isset($this->no_add) ? $this->no_add : false;
$helper->_listSkipDelete = $this->_listSkipDelete;
$helper->colorOnBackground = $this->colorOnBackground;
$this->content .= $helper->generateList($this->_list, $this->fieldsDisplay);
}
else if ($this->display == 'options')
@@ -1194,6 +1195,7 @@ class AdminControllerCore extends Controller
if (isset($_GET['deleteImage']))
{
$this->action = 'delete_image';
$token = Tools::getValue('token') ? Tools::getValue('token') : $this->token;
if (Validate::isLoadedObject($object = $this->loadObject()))
if (($object->deleteImage()))
Tools::redirectAdmin(self::$currentIndex.'&add'.$this->table.'&'.$this->identifier.'='.Tools::getValue($this->identifier).'&conf=7&token='.$token);
@@ -1277,7 +1279,7 @@ class AdminControllerCore extends Controller
public function displayErrors()
{
// @TODO includesubtab
$this->includeSubTab('displayErrors');
$content = $this->includeSubTab('displayErrors');
return $content;
}
@@ -1337,7 +1339,7 @@ class AdminControllerCore extends Controller
$selectShop = ', shop.name as shop_name ';
$joinShop = ' LEFT JOIN '._DB_PREFIX_.$this->shopLinkType.' shop
ON a.id_'.$this->shopLinkType.' = shop.id_'.$this->shopLinkType;
$whereShop = $this->context->shop->addSqlRestriction($this->shopShareDatas, 'a', $this->shopLinkType);
$whereShop = $this->context->shop->sqlRestriction($this->shopShareDatas, 'a', $this->shopLinkType);
}
$assos = Shop::getAssoTables();
if (isset($assos[$this->table]) && $assos[$this->table]['type'] == 'shop')