Skip to content

Commit b824f84

Browse files
rganinrganin
committed
Merge branch '2.4-develop' of https://github.com/magento/magento2ce into B2B-284-271
2 parents 29236e1 + 902d74d commit b824f84

File tree

19 files changed

+145
-22
lines changed

19 files changed

+145
-22
lines changed

‎app/code/Magento/Backend/Block/System/Account/Edit/Form.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function __construct(
6868
}
6969

7070
/**
71-
* {@inheritdoc}
71+
* @inheritdoc
7272
*/
7373
protected function _prepareForm()
7474
{
@@ -114,7 +114,7 @@ protected function _prepareForm()
114114
'name' => 'password',
115115
'label' => __('New Password'),
116116
'title' => __('New Password'),
117-
'class' => 'validate-admin-password admin__control-text'
117+
'class' => 'validate-admin-password'
118118
]
119119
);
120120

@@ -124,7 +124,7 @@ protected function _prepareForm()
124124
[
125125
'name' => 'password_confirmation',
126126
'label' => __('Password Confirmation'),
127-
'class' => 'validate-cpassword admin__control-text'
127+
'class' => 'validate-cpassword'
128128
]
129129
);
130130

@@ -152,7 +152,7 @@ protected function _prepareForm()
152152
'label' => __('Your Password'),
153153
'id' => self::IDENTITY_VERIFICATION_PASSWORD_FIELD,
154154
'title' => __('Your Password'),
155-
'class' => 'validate-current-password required-entry admin__control-text',
155+
'class' => 'validate-current-password required-entry',
156156
'required' => true
157157
]
158158
);

‎app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
use Magento\Framework\Registry;
1111
use Magento\Store\Model\ScopeInterface;
1212

13+
/**
14+
* Data provider for price filter in layered navigation
15+
*/
1316
class Price
1417
{
1518
/**
@@ -103,6 +106,8 @@ public function __construct(
103106
}
104107

105108
/**
109+
* Getter for interval
110+
*
106111
* @return array
107112
*/
108113
public function getInterval()
@@ -111,6 +116,8 @@ public function getInterval()
111116
}
112117

113118
/**
119+
* Setter for interval
120+
*
114121
* @param array $interval
115122
* @return void
116123
*/
@@ -120,6 +127,10 @@ public function setInterval($interval)
120127
}
121128

122129
/**
130+
* Retrieves price layered navigation modes
131+
*
132+
* @see RANGE_CALCULATION_AUTO
133+
*
123134
* @return mixed
124135
*/
125136
public function getRangeCalculationValue()
@@ -131,6 +142,8 @@ public function getRangeCalculationValue()
131142
}
132143

133144
/**
145+
* Retrieves range step
146+
*
134147
* @return mixed
135148
*/
136149
public function getRangeStepValue()
@@ -142,6 +155,8 @@ public function getRangeStepValue()
142155
}
143156

144157
/**
158+
* Retrieves one price interval
159+
*
145160
* @return mixed
146161
*/
147162
public function getOnePriceIntervalValue()
@@ -179,6 +194,8 @@ public function getRangeMaxIntervalsValue()
179194
}
180195

181196
/**
197+
* Retrieves Catalog Layer object
198+
*
182199
* @return Layer
183200
*/
184201
public function getLayer()
@@ -276,6 +293,8 @@ public function getMaxPrice()
276293
}
277294

278295
/**
296+
* Retrieve list of prior filters
297+
*
279298
* @param string $filterParams
280299
* @return array
281300
*/
@@ -310,7 +329,7 @@ public function validateFilter($filter)
310329
return false;
311330
}
312331
foreach ($filter as $v) {
313-
if ($v !== '' && $v !== '0' && (double)$v <= 0 || is_infinite((double)$v)) {
332+
if ($v !== '' && $v !== '0' && (!is_numeric($v) || (double)$v <= 0 || is_infinite((double)$v))) {
314333
return false;
315334
}
316335
}
@@ -339,6 +358,8 @@ public function getResetValue()
339358
}
340359

341360
/**
361+
* Getter for prior intervals
362+
*
342363
* @return array
343364
*/
344365
public function getPriorIntervals()
@@ -347,6 +368,8 @@ public function getPriorIntervals()
347368
}
348369

349370
/**
371+
* Setter for prior intervals
372+
*
350373
* @param array $priorInterval
351374
* @return void
352375
*/
@@ -356,6 +379,8 @@ public function setPriorIntervals($priorInterval)
356379
}
357380

358381
/**
382+
* Get Resource model for price filter
383+
*
359384
* @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
360385
*/
361386
public function getResource()
@@ -364,6 +389,8 @@ public function getResource()
364389
}
365390

366391
/**
392+
* Retrieves additional request data
393+
*
367394
* @return string
368395
*/
369396
public function getAdditionalRequestData()

‎app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ public function validateFilterDataProvider()
178178
['filter' => '0', 'result' => false],
179179
['filter' => 0, 'result' => false],
180180
['filter' => '100500INF', 'result' => false],
181+
['filter' => '-10\'[0]', 'result' => false],
181182
];
182183
}
183184

‎app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ protected function _addGeneralFieldset($form, $integrationData)
179179
'label' => __('Your Password'),
180180
'id' => self::DATA_CONSUMER_PASSWORD,
181181
'title' => __('Your Password'),
182-
'class' => 'input-text validate-current-password required-entry',
182+
'class' => 'validate-current-password required-entry',
183183
'required' => true
184184
]
185185
);

‎app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/**
1919
* Reports api controller
2020
*
21+
* phpcs:disable Magento2.Classes.AbstractApi
2122
* @api
2223
* @since 100.0.2
2324
* @SuppressWarnings(PHPMD.AllPurposeAction)
@@ -140,7 +141,7 @@ protected function _showLastExecutionTime($flagCode, $refreshCode)
140141
$flag = $this->_objectManager->create(\Magento\Reports\Model\Flag::class)
141142
->setReportFlagCode($flagCode)
142143
->loadSelf();
143-
$updatedAt = 'undefined';
144+
$updatedAt = __('Never');
144145
if ($flag->hasData()) {
145146
$updatedAt = $this->timezone->formatDate(
146147
$flag->getLastUpdate(),

‎app/code/Magento/Reports/i18n/en_US.csv‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,3 +224,5 @@ Action,Action
224224
Report,Report
225225
Description,Description
226226
undefined,undefined
227+
Never,Never
228+

‎app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<argument name="sortable" xsi:type="string">0</argument>
7272
<argument name="id" xsi:type="string">updated_at</argument>
7373
<argument name="index" xsi:type="string">updated_at</argument>
74-
<argument name="default" xsi:type="string" translate="true">undefined</argument>
74+
<argument name="default" xsi:type="string" translate="true">Never</argument>
7575
<argument name="column_css_class" xsi:type="string">col-period</argument>
7676
<argument name="header_css_class" xsi:type="string">col-period</argument>
7777
</arguments>

‎app/code/Magento/Theme/Test/Mftf/Section/AdminThemeSection.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<element name="rowsInThemeTitleColumn" type="text" selector="//tbody/tr/td[contains(@class, 'parent_theme')]/preceding-sibling::td"/>
1616
<element name="rowsInColumn" type="text" selector="//tbody/tr/td[contains(@class, '{{column}}')]" parameterized="true"/>
1717
<!--Specific cell e.g. {{Section.gridCell('Name')}}-->
18-
<element name="gridCell" type="text" selector="//table[@id='theme_grid_table']//td[contains(text(), '{{gridCellText}}')]" parameterized="true"/>
18+
<element name="gridCell" type="text" selector="//table//div[contains(text(), '{{gridCellText}}')]" parameterized="true"/>
19+
<element name="gridCellUpdated" type="text" selector="//tbody//tr//div[contains(text(), '{{gridCellText}}')]" parameterized="true"/>
1920
<element name="columnHeader" type="text" selector="//thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
2021
</section>
21-
</sections>
22+
</sections>

‎app/code/Magento/Theme/Test/Mftf/Test/AdminContentThemeSortTest.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminContentThemesSortTest">
12+
<annotations>
13+
<features value="Theme"/>
14+
<stories value="Menu Navigation"/>
15+
<title value="Admin content themes sort themes test"/>
16+
<description value="Admin should be able to sort Themes"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="https://github.com/magento/magento2/pull/25926"/>
19+
<group value="menu"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="logout" stepKey="logout"/>
26+
</after>
27+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentThemesPage">
28+
<argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
29+
<argument name="submenuUiId" value="{{AdminMenuContentDesignThemes.dataUiId}}"/>
30+
</actionGroup>
31+
<actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle">
32+
<argument name="title" value="{{AdminMenuContentDesignThemes.pageTitle}}"/>
33+
</actionGroup>
34+
<click selector="{{AdminThemeSection.columnHeader('Theme Title')}}" stepKey="clickSortByTitle"/>
35+
<click selector="{{AdminThemeSection.columnHeader('Theme Title')}}" stepKey="clickSortByTitleSecondTime"/>
36+
<seeNumberOfElements selector="{{AdminThemeSection.rowsInColumn('theme_path')}}" userInput="2" stepKey="see2RowsOnTheGrid"/>
37+
<seeNumberOfElements selector="{{AdminThemeSection.gridCellUpdated('Magento Luma')}}" userInput="1" stepKey="seeLumaThemeInTitleColumn"/>
38+
</test>
39+
</tests>

‎app/code/Magento/Theme/view/adminhtml/ui_component/design_theme_listing.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<dataSource name="design_theme_listing_data_source" component="Magento_Ui/js/grid/provider">
2121
<settings>
2222
<updateUrl path="mui/index/render"/>
23+
<storageConfig>
24+
<param name="indexField" xsi:type="string">theme_id</param>
25+
</storageConfig>
2326
</settings>
2427
<aclResource>Magento_Theme::theme</aclResource>
2528
<dataProvider class="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider" name="design_theme_listing_data_source">

0 commit comments

Comments
 (0)