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

// admincontroller fix when json

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10586 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-11-23 18:36:59 +00:00
parent 9ebe542fdb
commit fdd72b47fa
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+7 -1
View File
@@ -261,6 +261,8 @@ class AdminControllerCore extends Controller
21 => $this->l('Module reset successfully'), 22 => $this->l('Module deleted successfully'),
23 => $this->l('Localization pack imported successfully'), 24 => $this->l('Refund Successful'),
25 => $this->l('Images successfully moved'),
26 => $this->l('Cover selection saved'),
27 => $this->l('Image shop association modified'),
);
if (!$this->identifier) $this->identifier = 'id_'.$this->table;
if (!$this->_defaultOrderBy) $this->_defaultOrderBy = $this->identifier;
@@ -1084,7 +1086,11 @@ class AdminControllerCore extends Controller
else
$this->context->smarty->assign('confirmations', $this->confirmations);
$this->context->smarty->assign('page', $page);
if ($this->json)
$this->context->smarty->assign('page', Tools::jsonEncode($page));
else
$this->context->smarty->assign('page', $page);
$this->context->smarty->display($this->layout);
}