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

// change to Controller workflow

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8813 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-09-27 15:20:30 +00:00
parent 86f18ce106
commit 3192ddb27d
3 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+13 -26
View File
@@ -111,37 +111,30 @@ class AdminControllerCore extends Controller
return (!empty($token) AND $token === $this->token);
}
public function action()
public function postProcess()
{
if (!$this->ajax)
{
$this->postProcess();
$this->setMedia();
$this->initHeader();
$this->initFooter();
//$adminObj->displayConf();
//$adminObj->displayErrors();
}
else
if ($this->ajax)
{
// from ajax-tab.php
if(method_exists($this,'ajaxPreprocess'))
if (method_exists($this, 'ajaxPreprocess'))
$this->ajaxPreProcess();
$action = Tools::getValue('action');
// no need to use displayConf() here
if (!empty($action) AND method_exists($this, 'ajaxProcess'.Tools::toCamelCase($action)) )
if (!empty($action) && method_exists($this, 'ajaxProcess'.Tools::toCamelCase($action)))
$this->{'ajaxProcess'.Tools::toCamelCase($action)}();
else
$this->ajaxProcess();
// @TODO We should use a displayAjaxError
$this->displayErrors();
if (!empty($action) AND method_exists($this, 'displayAjax'.Tools::toCamelCase($action)) )
$this->{'displayAjax'.$action}();
else
$this->displayAjax();
// @TODO We should use a displayAjaxError
/*$this->displayErrors();
if (!empty($action) && method_exists($this, 'displayAjax'.Tools::toCamelCase($action)))
$this->{'displayAjax'.$action}();
else
$this->displayAjax(); */
}
else
{
}
}
@@ -549,10 +542,4 @@ class AdminControllerCore extends Controller
{
p($this->_errors);
}
public function postProcess()
{
}
}