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

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15338 b9a71923-0436-4b27-9f14-aed3839534dd

classes/controller/Controller.php

@@ -150,9 +150,6 @@ abstract class ControllerCore
 		$this->init();
 		if ($this->checkAccess())
 		{
-			if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className)))
-				$this->setMedia();
-
 			// postProcess handles ajaxProcess
 			$this->postProcess();
 
@@ -160,7 +157,10 @@ abstract class ControllerCore
 				$this->redirect();
 
 			if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className)))
+			{
+				$this->setMedia();
 				$this->initHeader();
+			}
 
 			if ($this->viewAccess())
 				$this->initContent();

controllers/admin/AdminProductsController.php

@@ -1413,7 +1413,10 @@ class AdminProductsControllerCore extends AdminController
 		$this->checkProduct();
 
 		if (!empty($this->errors))
+		{
+			$this->display = 'add';
 			return false;
+		}
 
 		$this->object = new $this->className();
 		$this->_removeTaxFromEcotax();
@@ -1503,7 +1506,7 @@ class AdminProductsControllerCore extends AdminController
 
 		if (!empty($this->errors))
 		{
-			//$this->display = 'edit';
+			$this->display = 'edit';
 			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/timepicker/jquery-ui-timepicker-addon.css',
 			));
-
 		}
 	}