Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIXES] #25674: Elasticsearch version selections in admin are overly … #25838

Merged
merged 2 commits into from
Dec 29, 2019
Merged

[FIXES] #25674: Elasticsearch version selections in admin are overly … #25838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf1b084
[FIXES] #25674: Elasticsearch version selections in admin are overly …
mautz-et-tong Nov 29, 2019
37cf56d
Merge branch '2.4-develop' into fix-for-25674
mautz-et-tong Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<test name="ProductQuickSearchUsingElasticSearchTest">
<annotations>
<features value="Search"/>
<stories value="Quick Search of products on Storefront when ES 5.0+ is enabled"/>
<stories value="Quick Search of products on Storefront when ES 5.x is enabled"/>
<title value="Product quick search doesn't throw exception after ES is chosen as search engine"/>
<description value="Verify no elastic search exception is thrown when searching for product before catalogsearch reindexing"/>
<severity value="CRITICAL"/>
Expand All @@ -36,7 +36,7 @@
</after>

<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
<comment userInput="Change Catalog search engine option to Elastic Search 5.0+" stepKey="chooseElasticSearch5"/>
<comment userInput="Change Catalog search engine option to Elastic Search 5.x" stepKey="chooseElasticSearch5"/>
<actionGroup ref="ChooseElasticSearchAsSearchEngine" stepKey="chooseES5"/>
<actionGroup ref="ClearPageCacheActionGroup" stepKey="clearing"/>
<actionGroup ref="updateIndexerBySchedule" stepKey="updateAnIndexerBySchedule">
Expand All @@ -57,4 +57,4 @@
<comment userInput="End of searching products" stepKey="endOfSearchingProducts"/>
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
</test>
</tests>
</tests>
2 changes: 1 addition & 1 deletion app/code/Magento/Elasticsearch/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<field id="engine">elasticsearch</field>
</depends>
</field>
<!-- Elasticsearch 5.0+ -->
<!-- Elasticsearch 5.x -->
<field id="elasticsearch5_server_hostname" translate="label" type="text" sortOrder="61" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Elasticsearch Server Hostname</label>
<depends>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Elasticsearch/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<arguments>
<argument name="engines" xsi:type="array">
<item name="elasticsearch" xsi:type="string">Elasticsearch</item>
<item name="elasticsearch5" xsi:type="string">Elasticsearch 5.0+</item>
<item name="elasticsearch5" xsi:type="string">Elasticsearch 5.x</item>
</argument>
</arguments>
</type>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Elasticsearch6/Test/Mftf/Data/ConfigData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<entity name="SearchEngineElasticsearchConfigData">
<data key="path">catalog/search/engine</data>
<data key="scope_id">1</data>
<data key="label">Elasticsearch 6.0+</data>
<data key="label">Elasticsearch 6.x</data>
<data key="value">elasticsearch6</data>
</entity>
</entities>
2 changes: 1 addition & 1 deletion app/code/Magento/Elasticsearch6/etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<system>
<section id="catalog">
<group id="search">
<!-- Elasticsearch 6.0+ -->
<!-- Elasticsearch 6.x -->
<field id="elasticsearch6_server_hostname" translate="label" type="text" sortOrder="71"
showInDefault="1" showInWebsite="0" showInStore="0">
<label>Elasticsearch Server Hostname</label>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Elasticsearch6/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
<arguments>
<argument name="engines" xsi:type="array">
<item name="elasticsearch6" xsi:type="string">Elasticsearch 6.0+</item>
<item name="elasticsearch6" xsi:type="string">Elasticsearch 6.x</item>
</argument>
</arguments>
</type>
Expand Down