//SupplierController+ManufacturerController : Refacto done

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8873 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 13:12:28 +00:00
parent 38a5ed6c79
commit 073c5f16f2
2 changed files with 53 additions and 41 deletions
@@ -73,17 +73,16 @@ class SupplierControllerCore extends FrontController
 	public function process()
 	{
 		if (Validate::isLoadedObject($this->supplier) && $this->supplier->active && $this->supplier->isAssociatedToGroupShop())
-			$this->assignOne();
-		else if (!Tools::getValue('id_supplier'))
-			$this->assignAll();
-
-		if ($this->supplier)
 		{
+			$this->assignOne();
 			$this->productSort();
 			$this->setTemplate(_PS_THEME_DIR_.'supplier.tpl');
 		}
 		else
+		{
+			$this->assignAll();
 			$this->setTemplate(_PS_THEME_DIR_.'supplier-list.tpl');
+		}
 	}
 	
 	/**