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

[-] BO : fix #PSCFV-2377 - missing JS files when saving product with errors

Browse Source
This commit is contained in:
tDidierjean
2012-05-16 13:31:44 +00:00
parent 2d6ac76bc0
commit a34564fc09
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/Controller.php
+3 -3
View File
@@ -150,9 +150,6 @@ abstract class ControllerCore
$this->init(); $this->init();
if ($this->checkAccess()) if ($this->checkAccess())
{ {
if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className)))
$this->setMedia();
// postProcess handles ajaxProcess // postProcess handles ajaxProcess
$this->postProcess(); $this->postProcess();
@@ -160,7 +157,10 @@ abstract class ControllerCore
$this->redirect(); $this->redirect();
if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className))) if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className)))
{
$this->setMedia();
$this->initHeader(); $this->initHeader();
}
if ($this->viewAccess()) if ($this->viewAccess())
$this->initContent(); $this->initContent();
controllers/admin/AdminProductsController.php
+4 -2
View File
@@ -1413,7 +1413,10 @@ class AdminProductsControllerCore extends AdminController
$this->checkProduct(); $this->checkProduct();
if (!empty($this->errors)) if (!empty($this->errors))
{
$this->display = 'add';
return false; return false;
}
$this->object = new $this->className(); $this->object = new $this->className();
$this->_removeTaxFromEcotax(); $this->_removeTaxFromEcotax();
@@ -1503,7 +1506,7 @@ class AdminProductsControllerCore extends AdminController
if (!empty($this->errors)) if (!empty($this->errors))
{ {
//$this->display = 'edit'; $this->display = 'edit';
return false; return false;
} }
@@ -3942,7 +3945,6 @@ class AdminProductsControllerCore extends AdminController
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.css', _PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.css',
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.css', _PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.css',
)); ));
} }
} }