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

[-] BO : Attributes can now be deleted in Catalogue : Attributes and Groups

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11768 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mBertholino
2011-12-26 14:41:29 +00:00
parent 232e8c2cc3
commit ae7b4a10ab
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+3 -2
View File
@@ -717,8 +717,9 @@ class AdminControllerCore extends Controller
$this->_errors = array_unique($this->_errors); $this->_errors = array_unique($this->_errors);
if (count($this->_errors) > 0) if (count($this->_errors) > 0)
return; return;
if (isset($object))
return $object; return $object;
return;
} }
/** /**
classes/Attribute.php
+2 -2
View File
@@ -320,9 +320,9 @@ class AttributeCore extends ObjectModel
// when delete, you must use $use_last_attribute // when delete, you must use $use_last_attribute
if ($use_last_attribute) if ($use_last_attribute)
$sql .= 'AND `id_attribute` != '.(int)$this->id; $sql .= ' AND `id_attribute` != '.(int)$this->id;
$sql .= 'ORDER BY `position`'; $sql .= ' ORDER BY `position`';
$result = Db::getInstance()->executeS($sql); $result = Db::getInstance()->executeS($sql);