Merge pull request #384 from magento-ogre/PR_Branch (fb909a9f) · Commits · KIII-12 / Magento

Commit fb909a9f authored 9 years ago by

Kopylova,Olga(okopylova)

Merge pull request #384 from magento-ogre/PR_Branch

[Ogre's] Search features, functional test fixes and bug fixes

parents 396adcad fb007029

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml 13 additions, 1 deletion

...ento/Backend/view/adminhtml/templates/system/search.phtml
app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php 75 additions, 21 deletions

...CatalogSearch/Model/ResourceModel/Advanced/Collection.php
app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php 124 additions, 15 deletions

...CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php 145 additions, 0 deletions

...Test/Unit/Model/ResourceModel/Advanced/CollectionTest.php
app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/BaseCollectionTest.php 84 additions, 0 deletions

...arch/Test/Unit/Model/ResourceModel/BaseCollectionTest.php
app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php 40 additions, 79 deletions

...Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
app/code/Magento/PageCache/Block/System/Config/Form/Field/Export.php 21 additions, 3 deletions

...gento/PageCache/Block/System/Config/Form/Field/Export.php
app/code/Magento/Search/Adapter/Mysql/Query/Preprocessor/Synonyms.php 43 additions, 0 deletions

...ento/Search/Adapter/Mysql/Query/Preprocessor/Synonyms.php
app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php 1 addition, 1 deletion

app/code/Magento/Search/Block/Adminhtml/Dashboard/Top.php
app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php 0 additions, 11 deletions

app/code/Magento/Search/Block/Adminhtml/Term/Edit/Form.php
app/code/Magento/Search/Controller/Adminhtml/Synonyms.php 45 additions, 1 deletion

app/code/Magento/Search/Controller/Adminhtml/Synonyms.php
app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php 3 additions, 1 deletion

...e/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
app/code/Magento/Search/Controller/Adminhtml/Synonyms/MassDelete.php 33 additions, 14 deletions

...gento/Search/Controller/Adminhtml/Synonyms/MassDelete.php
app/code/Magento/Search/Model/Query.php 3 additions, 12 deletions

app/code/Magento/Search/Model/Query.php
app/code/Magento/Search/Model/QueryFactory.php 1 addition, 1 deletion

app/code/Magento/Search/Model/QueryFactory.php
app/code/Magento/Search/Model/ResourceModel/Query.php 3 additions, 32 deletions

app/code/Magento/Search/Model/ResourceModel/Query.php
app/code/Magento/Search/Model/ResourceModel/Query/Collection.php 3 additions, 13 deletions

...e/Magento/Search/Model/ResourceModel/Query/Collection.php
app/code/Magento/Search/Model/ResourceModel/SynonymReader.php 1 addition, 1 deletion

...code/Magento/Search/Model/ResourceModel/SynonymReader.php
app/code/Magento/Search/Model/SearchEngine/Config.php 43 additions, 0 deletions

app/code/Magento/Search/Model/SearchEngine/Config.php
app/code/Magento/Search/Model/SearchEngine/Config/Data.php 24 additions, 0 deletions

app/code/Magento/Search/Model/SearchEngine/Config/Data.php

with 705 additions and 206 deletions

Please register or to comment

Admin message

Merge pull request #384 from magento-ogre/PR_Branch