// AdminControllers cleanup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10716 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -233,10 +233,7 @@ class AdminControllerCore extends Controller
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
// retro-compatibility : className for admin without controller
|
||||
// This can be overriden in controllers (like for AdminCategories or AdminProducts
|
||||
$controller = get_class($this);
|
||||
|
||||
// temporary fix for Token retrocompatibility
|
||||
// This has to be done when url is built instead of here)
|
||||
if (strpos($controller, 'Controller'))
|
||||
@@ -389,8 +386,6 @@ class AdminControllerCore extends Controller
|
||||
// set token
|
||||
$token = Tools::getValue('token') ? Tools::getValue('token') : $this->token;
|
||||
|
||||
// Sub included tab postProcessing
|
||||
$this->includeSubTab('postProcess', array('status', 'submitAdd1', 'submitDel', 'delete', 'submitFilter', 'submitReset'));
|
||||
if (!empty($this->action) && method_exists($this, 'process'.ucfirst(Tools::toCamelCase($this->action))))
|
||||
return $this->{'process'.Tools::toCamelCase($this->action)}($token);
|
||||
else if (method_exists($this, $this->action))
|
||||
@@ -964,7 +959,6 @@ class AdminControllerCore extends Controller
|
||||
return false;
|
||||
}
|
||||
|
||||
$this->content = $this->displayErrors();
|
||||
return $this->object;
|
||||
}
|
||||
|
||||
@@ -990,13 +984,6 @@ class AdminControllerCore extends Controller
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @TODO
|
||||
*/
|
||||
public function includeSubTab($methodname, $actions = array())
|
||||
{
|
||||
}
|
||||
|
||||
protected function filterToField($key, $filter)
|
||||
{
|
||||
foreach ($this->fieldsDisplay as $field)
|
||||
@@ -1823,16 +1810,6 @@ class AdminControllerCore extends Controller
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Display errors
|
||||
*/
|
||||
public function displayErrors()
|
||||
{
|
||||
// @TODO includesubtab
|
||||
$content = $this->includeSubTab('displayErrors');
|
||||
return $content;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the current objects' list form the database
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user