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

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

Browse Source
This commit is contained in:
aFolletete
2012-02-16 15:55:11 +00:00
parent ae39800143
commit bdcc800cd4
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminManufacturersController.php
+2 -1
View File
@@ -505,7 +505,8 @@ class AdminManufacturersControllerCore extends AdminController
$this->fields_value = array(
'name' => Manufacturer::getNameById($address->id_manufacturer),
'alias' => 'manufacturer'
'alias' => 'manufacturer',
'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
);
$this->initToolbar();
controllers/admin/AdminStoresController.php
+2 -1
View File
@@ -291,7 +291,8 @@ class AdminStoresControllerCore extends AdminController
'image' => $image ? $image : false,
'size' => $image ? filesize(_PS_STORE_IMG_DIR_.'/'.$obj->id.'.jpg') / 1000 : false,
'days' => $days,
'hours' => isset($hours_unserialized) ? $hours_unserialized : false
'hours' => isset($hours_unserialized) ? $hours_unserialized : false,
'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
);
return parent::renderForm();
controllers/admin/AdminSuppliersController.php
+4 -1
View File
@@ -230,7 +230,10 @@ class AdminSuppliersControllerCore extends AdminController
);
}
else
$this->fields_value['id_address'] = 0;
$this->fields_value = array(
'id_address' => 0,
'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
);
if (Shop::isFeatureActive())
controllers/admin/AdminWarehousesController.php
+4 -10
View File
@@ -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()
*/