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

[-] BO : BugFix : #PSCFV-2373 : Problem on country creation

Browse Source
This commit is contained in:
vChabot
2012-05-16 13:17:07 +00:00
parent 72d8a44855
commit c70b3449f0
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Country.php
+1
View File
@@ -71,6 +71,7 @@ class CountryCore extends ObjectModel
'table' => 'country', 'table' => 'country',
'primary' => 'id_country', 'primary' => 'id_country',
'multilang' => true, 'multilang' => true,
'multishop' => true,
'fields' => array( 'fields' => array(
'id_zone' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true), 'id_zone' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
'id_currency' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'id_currency' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
classes/ObjectModel.php
+1 -1
View File
@@ -195,7 +195,7 @@ abstract class ObjectModelCore
if ($id_lang) if ($id_lang)
{ {
$sql->leftJoin($this->def['table'].'_lang', 'b', 'a.'.$this->def['primary'].' = b.'.$this->def['primary'].' AND b.id_lang = '.(int)$id_lang); $sql->leftJoin($this->def['table'].'_lang', 'b', 'a.'.$this->def['primary'].' = b.'.$this->def['primary'].' AND b.id_lang = '.(int)$id_lang);
if ($this->id_shop) if ($this->id_shop && !empty($this->def['multilang_shop']))
$sql->where('b.id_shop = '.$this->id_shop); $sql->where('b.id_shop = '.$this->id_shop);
} }
controllers/admin/AdminCountriesController.php
-3
View File
@@ -384,9 +384,6 @@ class AdminCountriesControllerCore extends AdminController
$tmp_addr_format->id_country = $id_country; $tmp_addr_format->id_country = $id_country;
} }
$object = new $this->className();
$this->updateAssoShop($object->id);
$tmp_addr_format->format = Tools::getValue('address_layout'); $tmp_addr_format->format = Tools::getValue('address_layout');
if (strlen($tmp_addr_format->format) > 0) if (strlen($tmp_addr_format->format) > 0)