[-] BO : the default country of shop is correctly selected by default in forms with country field #PSTEST-493

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13407 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 15:55:11 +00:00
parent 92db3de64a
commit 3992d7da89
4 changed files with 12 additions and 13 deletions
@@ -370,22 +370,16 @@ class AdminWarehousesControllerCore extends AdminController
 				'id_state' => $address->id_state,
 			);
 		else
-			$this->fields_value['id_address'] = 0;
+			$this->fields_value = array(
+				'id_address' => 0,
+				'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
+			);
 		$this->fields_value['ids_shops[]'] = $ids_shop;
 		$this->fields_value['ids_carriers[]'] = $carriers;

 		return parent::renderForm();
 	}

-	/**
-	 * AdminController::postProcess() override
-	 * @see AdminController::postProcess()
-	 */
-	public function postProcess()
-	{
-		return parent::postProcess();
-	}
-
 	/**
 	 * @see AdminController::renderView()
 	 */