From 1199ad8cf2f4c5074a45d640e50d5f837b7408d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Nadaud?= Date: Wed, 17 Jul 2013 10:51:34 +0200 Subject: [PATCH 1/4] [-] BO : FixBug #PSCFV-6365 Missing message confirmation for Images modification in Preferences > Images --- controllers/admin/AdminImagesController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 22694773d..8791cd27f 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -375,6 +375,7 @@ class AdminImagesControllerCore extends AdminController || !Configuration::updateValue('PS_PNG_QUALITY', Tools::getValue('PS_PNG_QUALITY'))) $this->errors[] = Tools::displayError('Unknown error.'); else + $this->confirmations[] = $this->_conf[6]; return parent::postProcess(); } else From 899dc30097ef9bb6797b210de3d01e2d150c15c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Gaillard?= Date: Wed, 17 Jul 2013 11:33:33 +0200 Subject: [PATCH 2/4] [-] Class : AdminController - Object id fixed --- classes/controller/AdminController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 48366d2c4..967e5a8bf 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -803,7 +803,7 @@ class AdminControllerCore extends Controller if (empty($this->redirect_after)) $this->redirect_after = self::$currentIndex.($parent_id ? '&'.$this->identifier.'='.$object->id : '').'&conf=4&token='.$this->token; } - Logger::addLog(sprintf($this->l('%s edition'), $this->className), 1, null, $this->className, (int)$this->object->id, true, (int)$this->context->employee->id); + Logger::addLog(sprintf($this->l('%s edition'), $this->className), 1, null, $this->className, (int)$object->id, true, (int)$this->context->employee->id); } else $this->errors[] = Tools::displayError('An error occurred while updating an object.'). @@ -3013,4 +3013,4 @@ class AdminControllerCore extends Controller return $return; } -} \ No newline at end of file +} From 1b9892b9444284c4c2ee3f67205631f74e4f73e9 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Wed, 17 Jul 2013 13:42:45 +0200 Subject: [PATCH 3/4] // removed deprecated message --- classes/db/DbPDO.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/classes/db/DbPDO.php b/classes/db/DbPDO.php index 2e267e0a4..ab5d1ede8 100644 --- a/classes/db/DbPDO.php +++ b/classes/db/DbPDO.php @@ -25,8 +25,6 @@ */ /** - * This class is currently only here for tests - * * @since 1.5.0 */ class DbPDOCore extends Db From 421c199e1f3d8eb41c77d17b387d0129730c1403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Nadaud?= Date: Wed, 17 Jul 2013 15:13:34 +0200 Subject: [PATCH 4/4] [-] BO : FixBug #PSCFV-8229 Default country value set to manufacturer country Default country value set to manufacturer country Click on manufacturer address line now redirect to manufacturer address edition --- controllers/admin/AdminManufacturersController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index b1e630bc1..0f23f90d3 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -511,7 +511,7 @@ class AdminManufacturersControllerCore extends AdminController $this->fields_value = array( 'name' => Manufacturer::getNameById($address->id_manufacturer), 'alias' => 'manufacturer', - 'id_country' => Configuration::get('PS_COUNTRY_DEFAULT') + 'id_country' => $address->id_country ); $this->initToolbar(); @@ -671,6 +671,8 @@ class AdminManufacturersControllerCore extends AdminController if (Tools::isSubmit('editaddresses')) $this->display = 'editaddresses'; + else if (Tools::isSubmit('updateaddress')) + $this->display = 'editaddresses'; else if (Tools::isSubmit('addaddress')) $this->display = 'addaddress'; else if (Tools::isSubmit('submitAddaddress'))