Skip to content

Commit 6c9d5c8

Browse files
bubasumabubasuma
committed
Merge remote-tracking branch 'origin/2.4-develop' into MC-41796
2 parents 90334d9 + ed2ffad commit 6c9d5c8

File tree

1,244 files changed

+27506
-118874
lines changed

Some content is hidden

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

1,244 files changed

+27506
-118874
lines changed

‎app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<policy id="script-src">
1212
<values>
1313
<value id="adobedtm" type="host">assets.adobedtm.com</value>
14+
<value id="adobe" type="host">*.adobe.com</value>
15+
</values>
16+
</policy>
17+
<policy id="style-src">
18+
<values>
19+
<value id="adobe" type="host">*.adobe.com</value>
1420
</values>
1521
</policy>
1622
<policy id="img-src">
@@ -19,6 +25,7 @@
1925
<value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
2026
<value id="dpmdemdex" type="host">dpm.demdex.net</value>
2127
<value id="everesttech" type="host">cm.everesttech.net</value>
28+
<value id="adobe" type="host">*.adobe.com</value>
2229
</values>
2330
</policy>
2431
<policy id="connect-src">
@@ -27,9 +34,15 @@
2734
<value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
2835
</values>
2936
</policy>
37+
<policy id="media-src">
38+
<values>
39+
<value id="adobe" type="host">*.adobe.com</value>
40+
</values>
41+
</policy>
3042
<policy id="frame-src">
3143
<values>
3244
<value id="amcdemdex" type="host">fast.amc.demdex.net</value>
45+
<value id="adobe" type="host">*.adobe.com</value>
3346
</values>
3447
</policy>
3548
</policies>

‎app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/columns/message.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@ define([
3636
return record[this.messageIndex];
3737
},
3838

39+
/**
40+
* Proxy to getLabel function with UnsanitizedHtml suffix
41+
*
42+
* @param {Object} record
43+
* @returns {String}
44+
*/
45+
getLabelUnsanitizedHtml: function (record) {
46+
return this.getLabel(record);
47+
},
48+
3949
/** @inheritdoc */
4050
getFieldClass: function ($row) {
4151
var status = this.statusMap[$row.status] || 'warning',

‎app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/cells/message.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
*/
66
-->
77
<div css="$col.getFieldClass($row())"
8-
html="$col.getLabel($row())"/>
8+
html="$col.getLabelUnsanitizedHtml($row())"></div>

‎app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public function execute()
3434
/** @var $export \Magento\ImportExport\Model\Export */
3535
$export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
3636
$export->setData($data);
37-
$attrFilterBlock->prepareCollection(
38-
$export->filterAttributeCollection($export->getEntityAttributeCollection())
37+
$export->filterAttributeCollection(
38+
$attrFilterBlock->prepareCollection($export->getEntityAttributeCollection())
3939
);
4040
return $resultLayout;
4141
} catch (\Exception $e) {

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminAdvancedReportingButtonTest">
1111
<annotations>
12-
<stories value="AdvancedReporting"/>
13-
<title value="AdvancedReportingButtonTest"/>
14-
<description value="Test log in to AdvancedReporting and tests AdvancedReportingButtonTest"/>
15-
<testCaseId value="MC-14800"/>
16-
<skip>
17-
<issueId value="MC-14800" />
18-
</skip>
12+
<features value="Analytics"/>
13+
<stories value="Advanced Reporting"/>
14+
<title value="Assert the Advanced Reporting page is opened by dashboard link"/>
15+
<description value="Check the ability to navigate to the Advanced Reporting page through the Advanced Reporting button on the dashboard"/>
1916
<severity value="CRITICAL"/>
17+
<testCaseId value="MC-28376"/>
2018
<group value="analytics"/>
2119
<group value="mtf_migrated"/>
2220
</annotations>

‎app/code/Magento/AsynchronousOperations/Model/AccessValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ public function isAllowed($bulkUuid)
5555
$this->bulkSummaryFactory->create(),
5656
$bulkUuid
5757
);
58-
return $bulkSummary->getUserId() === $this->userContext->getUserId();
58+
return ((int) $bulkSummary->getUserId()) === ((int) $this->userContext->getUserId());
5959
}
6060
}

‎app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/form/field.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
-->
77
<div css="$data.additionalClasses"
88
if="error"
9-
text="error"/>
9+
text="error"></div>

‎app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/cells/actions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
attr="{
1212
title: $action().label
1313
}"
14-
/>
14+
></button>
1515
</div>

‎app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
<a class="action__message-log"
3232
href="#"
3333
click="dismissAll"
34-
text="dismissAllText"/>
34+
text="dismissAllText"></a>
3535
<a class="action__message-log"
3636
attr="{
3737
href: link
3838
}"
39-
text="linkText"/>
39+
text="linkText"></a>
4040
</div>
4141
</div>
4242
</div>

‎app/code/Magento/Authorization/Model/CompositeUserContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected function add(UserContextInterface $userContext)
6060
*/
6161
public function getUserId()
6262
{
63-
return $this->getUserContext() ? $this->getUserContext()->getUserId() : null;
63+
return $this->getUserContext() ? ((int) $this->getUserContext()->getUserId()) : null;
6464
}
6565

6666
/**

0 commit comments

Comments
 (0)