//fixed multishop CRUD bug

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16555 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-07-24 16:45:52 +00:00
parent acb7dd35ed
commit 7eec6c7294
9 changed files with 137 additions and 141 deletions
+30 -27
View File
@@ -110,33 +110,36 @@ class AttributeGroupCore extends ObjectModel
public function delete()
{
/* Select children in order to find linked combinations */
$attribute_ids = Db::getInstance()->executeS('
SELECT `id_attribute`
FROM `'._DB_PREFIX_.'attribute`
WHERE `id_attribute_group` = '.(int)$this->id
);
if ($attribute_ids === false)
return false;
/* Removing attributes to the found combinations */
$to_remove = array();
foreach ($attribute_ids as $attribute)
$to_remove[] = (int)$attribute['id_attribute'];
if (!empty($to_remove) && Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_attribute_combination`
WHERE `id_attribute`
IN ('.implode(', ', $to_remove).')') === false)
return false;
/* Remove combinations if they do not possess attributes anymore */
if (!AttributeGroup::cleanDeadCombinations())
return false;
/* Also delete related attributes */
if (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'attribute_lang`
WHERE `id_attribute`
IN (SELECT id_attribute FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id.')') === false ||
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id) === false)
return false;
if (!$this->hasMultishopEntries())
{
/* Select children in order to find linked combinations */
$attribute_ids = Db::getInstance()->executeS('
SELECT `id_attribute`
FROM `'._DB_PREFIX_.'attribute`
WHERE `id_attribute_group` = '.(int)$this->id
);
if ($attribute_ids === false)
return false;
/* Removing attributes to the found combinations */
$to_remove = array();
foreach ($attribute_ids as $attribute)
$to_remove[] = (int)$attribute['id_attribute'];
if (!empty($to_remove) && Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_attribute_combination`
WHERE `id_attribute`
IN ('.implode(', ', $to_remove).')') === false)
return false;
/* Remove combinations if they do not possess attributes anymore */
if (!AttributeGroup::cleanDeadCombinations())
return false;
/* Also delete related attributes */
if (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'attribute_lang`
WHERE `id_attribute`
IN (SELECT id_attribute FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id.')') === false ||
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id) === false)
return false;
}
$return = parent::delete();
if ($return)
Hook::exec('actionAttributeGroupDelete', array('id_attribute_group' => $this->id));