Skip to content

Commit 7502723

Browse files
Usik2203Usik2203
authored
Merge branch '2.4-develop' into mftf-gift-message
2 parents c6016f5 + 6a0db3b commit 7502723

File tree

305 files changed

+5029
-2216
lines changed

Some content is hidden

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

305 files changed

+5029
-2216
lines changed

‎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/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
/**

‎app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
class="action-secondary"
1717
type="button"
1818
click="processingAddChild.bind($data, false, false, false)">
19-
<span translate="addButtonLabel"/>
19+
<span translate="addButtonLabel"></span>
2020
</button>
2121
</div>
2222

@@ -30,7 +30,7 @@
3030
css="$data.setClasses($data)"
3131
attr="'data-index': index">
3232
<label if="$data.label" class="admin__field-label" attr="for: $data.uid">
33-
<span translate="$data.label"/>
33+
<span translate="$data.label"></span>
3434
</label>
3535

3636
<div class="admin__field-control" data-role="grid-wrapper">
@@ -47,14 +47,14 @@
4747
<thead if="element.columnsHeader">
4848
<tr>
4949
<th if="$data.dndConfig.enabled"
50-
class="data-grid-draggable-row-cell"/>
50+
class="data-grid-draggable-row-cell"></th>
5151

5252
<th repeat="foreach: labels, item: '$label'"
5353
class="data-grid-th"
5454
visible="$label().visible"
5555
disable="$label().disabled"
5656
css="setClasses($label())">
57-
<span translate="$label().label"/>
57+
<span translate="$label().label"></span>
5858
</th>
5959
</tr>
6060
</thead>
@@ -65,15 +65,15 @@
6565
css="'_odd-row': $index % 2">
6666
<td if="dndConfig.enabled"
6767
class="data-grid-draggable-row-cell"
68-
template="name: dndConfig.template, data: dnd"/>
68+
template="name: dndConfig.template, data: dnd"></td>
6969

7070
<!-- ko foreach: { data: $record().elems(), as: 'elem'} -->
7171
<td if="elem.template"
7272
visible="elem.visible() && elem.formElement !== 'hidden'"
7373
disable="elem.disabled"
7474
css="$parent.setClasses(elem)"
7575
template="elem.template"
76-
attr="'data-index': index"/>
76+
attr="'data-index': index"></td>
7777
<!-- /ko -->
7878
</tr>
7979
</tbody>

‎app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
class="input-text admin__control-text qty validate-greater-than-zero<?php if (!$_canChangeQty) { echo ' qty-disabled'; } ?>"
7070
type="text"
7171
name="bundle_option_qty[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
72-
value="<?= $block->escapeHtmlAttr($_defaultQty) ?>" />
72+
value="<?= $block->escapeHtmlAttr($_defaultQty) ?>"></div>
7373
</div>
7474
</div>
7575
</div>

‎app/code/Magento/Bundle/view/base/web/template/product/price/minimal_price.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
css="getAdjustmentCssClasses($row())">
1010
<span if="label"
1111
class="price-label"
12-
text="label"/>
12+
text="label"></span>
1313

1414
<span class="price-wrapper"
1515
css="priceWrapperCssClasses"
1616
attr="priceWrapperAttr"
1717
data-price-amount=""
1818
data-price-type=""
19-
html="getMinimalPrice($row())"/>
19+
html="getMinimalPriceUnsanitizedHtml($row())"></span>
2020

2121
<each args="data: getAdjustments(), as: '$adj'">
2222
<render args="$adj.getBody()"/>

‎app/code/Magento/Bundle/view/frontend/web/js/slide.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ define([
8585
$('html, body').animate({
8686
scrollTop: $(this.options.bundleOptionsContainer).offset().top
8787
}, 600);
88-
$('#product-options-wrapper > fieldset').focus();
88+
$('#product-options-wrapper > fieldset').trigger('focus');
8989
},
9090

9191
/**

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ define([
4545
content: data.message
4646
});
4747
} else {
48-
$(this.options.categoryIdSelector).val(data.id).change();
49-
$(this.options.categoryPathSelector).val(data.path).change();
50-
$(this.options.categoryParentSelector).val(data.parentId).change();
51-
$(this.options.categoryLevelSelector).val(data.level).change();
48+
$(this.options.categoryIdSelector).val(data.id).trigger('change');
49+
$(this.options.categoryPathSelector).val(data.path).trigger('change');
50+
$(this.options.categoryParentSelector).val(data.parentId).trigger('change');
51+
$(this.options.categoryLevelSelector).val(data.level).trigger('change');
5252
}
5353
}
5454
};

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ define([
4747
closed: function () {
4848
var doc = self.iframe.get(0).document;
4949

50-
if (doc && $.isFunction(doc.execCommand)) {
50+
if (doc && typeof doc.execCommand === 'function') {
5151
//IE9 break script loading but not execution on iframe removing
5252
doc.execCommand('stop');
5353
self.iframe.remove();

‎app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ define([
437437
this.refreshSortableElements();
438438
this.options.selectionItemCount[data.id] = parseInt(this.options.selectionItemCount[data.id], 10) + 1;
439439

440-
$('#' + this.options.fieldId + '_' + data.id + '_select_' + data['select_id'] + '_title').focus();
440+
$('#' + this.options.fieldId + '_' + data.id + '_select_' + data['select_id'] + '_title').trigger('focus');
441441
},
442442

443443
/**

‎app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ define([
7575
$('#new_category_name').val(enteredName);
7676

7777
if (enteredName === '') {
78-
$('#new_category_name').focus();
78+
$('#new_category_name').trigger('focus');
7979
}
8080
$('#new_category_messages').html('');
8181
},
@@ -88,7 +88,7 @@ define([
8888
validationOptions.unhighlight($('#new_category_parent-suggest').get(0),
8989
validationOptions.errorClass, validationOptions.validClass || '');
9090
newCategoryForm.validation('clearError');
91-
$('#category_ids-suggest').focus();
91+
$('#category_ids-suggest').trigger('focus');
9292
},
9393
buttons: [{
9494
text: $.mage.__('Create Category'),

‎app/code/Magento/Catalog/view/adminhtml/web/template/attributes/grid/paging.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
-->
77
<ul class="admin__control-support-text attributes-summary">
88
<li class="attributes-selected">
9-
<span translate="'Selected Attributes\:'"/>
10-
<span text="label"/>
9+
<span translate="'Selected Attributes\:'"></span>
10+
<span text="label"></span>
1111
</li>
1212
<li class="attributes-found">
1313
<text args="totalRecords"/> records found

‎app/code/Magento/Catalog/view/adminhtml/web/template/form/element/frontend-input-select.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
optionsCaption: caption,
1818
optionsValue: 'value',
1919
optionsText: 'label'"
20-
/>
20+
></select>
2121
<div class="admin__field-note" if="$data.hints">
22-
<span translate="$data.hints[$data.value()]"/>
22+
<span translate="$data.hints[$data.value()]"></span>
2323
</div>

‎app/code/Magento/Catalog/view/adminhtml/web/template/form/element/input.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
id: uid,
1818
disabled: disabled
1919
}"/>
20-
<label class="admin__field-error" if="error" attr="for: uid" text="error"/>
20+
<label class="admin__field-error" if="error" attr="for: uid" text="error"></label>

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
css="$data.additionalClasses"
1010
attr="'data-index': index">
1111
<label class="admin__field-label" if="$data.label" visible="$data.labelVisible" attr="for: uid">
12-
<span translate="label" attr="'data-config-scope': $data.scopeLabel"/>
12+
<span translate="label" attr="'data-config-scope': $data.scopeLabel"></span>
1313
</label>
1414
<div class="admin__field-control"
1515
css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
@@ -19,24 +19,28 @@
1919
<render args="elementTmpl"/>
2020

2121
<label class="admin__addon-prefix" if="addBefore()" attr="for: uid">
22-
<span text="addBefore()"/>
22+
<span text="addBefore()"></span>
2323
</label>
2424
<label class="admin__addon-suffix" if="$data.addafter" attr="for: uid">
25-
<span text="addafter"/>
25+
<span text="addafter"></span>
2626
</label>
2727
</div>
2828

2929
<render args="tooltipTpl" if="$data.tooltip"/>
3030

3131
<render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
3232

33-
<label class="admin__field-error" if="error" attr="for: uid" text="error"/>
33+
<label class="admin__field-error" if="error" attr="for: uid" text="error"></label>
3434

3535
<div class="admin__field-note" if="$data.notice" attr="id: noticeId">
36-
<span translate="notice"/>
36+
<span translate="notice"></span>
3737
</div>
3838

39-
<div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfo"></div>
39+
<!-- ko if: $data.additionalInfo -->
40+
<!-- ko with: {additionalInfoUnsanitizedHtml: $data.additionalInfo} -->
41+
<div class="admin__additional-info" html="additionalInfoUnsanitizedHtml"></div>
42+
<!-- /ko -->
43+
<!-- /ko -->
4044

4145
<render args="$data.service.template" if="$data.hasService()"/>
4246
</div>

‎app/code/Magento/Catalog/view/adminhtml/web/template/grid/cells/preserved.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<div class="data-grid-cell-content white-space-preserved" html="$col.getLabel($row())"/>
7+
<div class="data-grid-cell-content white-space-preserved" html="$col.getLabelUnsanitizedHtml($row())"></div>

‎app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="file-uploader-summary">
88
<div class="file-uploader-preview image-uploader-preview">
99
<a class="image-uploader-preview-link" attr="href: $parent.getFilePreview($file)" target="_blank">
10-
<div class="file-uploader-spinner image-uploader-spinner" />
10+
<div class="file-uploader-spinner image-uploader-spinner"></div>
1111
<img
1212
class="preview-image"
1313
tabindex="0"
@@ -26,12 +26,12 @@
2626
attr="title: $t('Delete image')"
2727
disable="$parent.disabled"
2828
click="$parent.removeFile.bind($parent, $file)">
29-
<span translate="'Delete image'"/>
29+
<span translate="'Delete image'"></span>
3030
</button>
3131
</div>
3232
</div>
3333

34-
<div class="file-uploader-filename" text="$file.name"/>
34+
<div class="file-uploader-filename" text="$file.name"></div>
3535
<div class="file-uploader-meta">
3636
<text args="$file.previewWidth"/>x<text args="$file.previewHeight"/>,
3737
<text args="$parent.formatSize($file.size)"/>

0 commit comments

Comments
 (0)