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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-06-18 11:32:56 +02:00
parent 6519d3682a 5f4b6a6534
commit 4c4340c9d1
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+1
View File
@@ -4565,6 +4565,7 @@ class ProductCore extends ObjectModel
*/ */
public function setWsAccessories($accessories) public function setWsAccessories($accessories)
{ {
$this->deleteAccessories();
foreach ($accessories as $accessory) foreach ($accessories as $accessory)
Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'accessory` (`id_product_1`, `id_product_2`) VALUES ('.(int)$this->id.', '.(int)$accessory['id'].')'); Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'accessory` (`id_product_1`, `id_product_2`) VALUES ('.(int)$this->id.', '.(int)$accessory['id'].')');
controllers/admin/AdminModulesController.php
+4
View File
@@ -673,6 +673,10 @@ class AdminModulesControllerCore extends AdminController
// Get the return value of current method // Get the return value of current method
$echo = $module->{$method}(); $echo = $module->{$method}();
// After a successful install of a single module that has a configuration method, to the configuration page
if ($key == 'install' && $echo === true && strpos(Tools::getValue('install'), '|') === false && method_exists($module, 'getContent'))
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&configure='.$module->name.'&conf=12');
} }
// If the method called is "configure" (getContent method), we show the html code of configure page // If the method called is "configure" (getContent method), we show the html code of configure page