Skip to content

Commit 04965cf

Browse files
author
Igor Miniailo
committed
Merge branch 'masterce' into S60
Conflicts: app/code/Magento/Catalog/Model/Resource/Category.php
2 parents 471a933 + c67bf2c commit 04965cf

File tree

44 files changed

+3610
-1652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3610
-1652
lines changed

app/code/Magento/Catalog/Model/Resource/Category.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,9 @@ protected function _beforeSave(\Magento\Framework\Object $object)
234234
}
235235

236236
if ($object->isObjectNew()) {
237+
if (is_null($object->getPosition())) {
238+
$object->setPosition($this->_getMaxPosition($object->getPath()) + 1);
239+
}
237240
$path = explode('/', $object->getPath());
238241
$level = count($path) - ($object->getId() ? 1 : 0);
239242
$toUpdateChild = array_diff($path, [$object->getId()]);

app/code/Magento/CatalogImportExport/Model/Export/Product.php

Lines changed: 351 additions & 335 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)