Merge pull request #54 from magento-nord/develop

[Nord] Refactor and Test Coverage classes
magento · Jan 28, 2015 · c67bf2c · c67bf2c
2 parents 5a00464 + ab9e85c
commit c67bf2c
Show file tree

Hide file tree

Showing 44 changed files with 3,610 additions and 1,653 deletions.
diff --git a/app/code/Magento/Catalog/Model/Resource/Category.php b/app/code/Magento/Catalog/Model/Resource/Category.php
@@ -236,7 +236,9 @@ protected function _beforeSave(\Magento\Framework\Object $object)
         }
 
         if (!$object->getId()) {
-            $object->setPosition($this->_getMaxPosition($object->getPath()) + 1);
+            if (is_null($object->getPosition())) {
+                $object->setPosition($this->_getMaxPosition($object->getPath()) + 1);
+            }
             $path = explode('/', $object->getPath());
             $level = count($path);
             $object->setLevel($level);

diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php