Merge pull request #351 from magento-troll/MAGETWO-43939 (a9797cd9) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit a9797cd9 authored 9 years ago by

Ganin, Roman(rganin)

Merge pull request #351 from magento-troll/MAGETWO-43939

[Troll] Category staging

parents 730e198e 2446bbd5

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Model/Category.php 2 additions, 0 deletions

app/code/Magento/Catalog/Model/Category.php
app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php 30 additions, 8 deletions

...to/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php 2 additions, 2 deletions

...gento/Catalog/Model/Indexer/Category/Flat/Action/Full.php
app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php 15 additions, 8 deletions

...gento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php 14 additions, 10 deletions

...Catalog/Model/Indexer/Category/Product/AbstractAction.php
app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php 7 additions, 6 deletions

.../Magento/Catalog/Model/ResourceModel/AbstractResource.php
app/code/Magento/Catalog/Model/ResourceModel/Category.php 171 additions, 26 deletions

app/code/Magento/Catalog/Model/ResourceModel/Category.php
app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php 49 additions, 30 deletions

...ode/Magento/Catalog/Model/ResourceModel/Category/Tree.php
app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php 11 additions, 0 deletions

...log/Model/ResourceModel/Collection/AbstractCollection.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php 6 additions, 1 deletion

...agento/Catalog/Model/ResourceModel/Product/Collection.php
app/code/Magento/Catalog/Model/ResourceModel/Product/Compare/Item/Collection.php 1 addition, 0 deletions

...g/Model/ResourceModel/Product/Compare/Item/Collection.php
app/code/Magento/Catalog/Model/ResourceModel/Url.php 47 additions, 15 deletions

app/code/Magento/Catalog/Model/ResourceModel/Url.php
app/code/Magento/Catalog/Setup/InstallSchema.php 0 additions, 12 deletions

app/code/Magento/Catalog/Setup/InstallSchema.php
app/code/Magento/Catalog/Setup/Recurring.php 61 additions, 0 deletions

app/code/Magento/Catalog/Setup/Recurring.php
app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/TreeTest.php 35 additions, 2 deletions

...talog/Test/Unit/Model/ResourceModel/Category/TreeTest.php
app/code/Magento/Catalog/etc/di.xml 16 additions, 0 deletions

app/code/Magento/Catalog/etc/di.xml
app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php 1 addition, 0 deletions

...dapter/Mysql/Plugin/Aggregation/Category/DataProvider.php
app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php 1 addition, 0 deletions

...CatalogSearch/Model/ResourceModel/Advanced/Collection.php
app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php 9 additions, 5 deletions

...CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php 1 addition, 0 deletions

...o/CatalogSearch/Model/ResourceModel/Search/Collection.php

with 479 additions and 125 deletions

Please register or to comment

Admin message

Merge pull request #351 from magento-troll/MAGETWO-43939