Skip to content

Commit f3909aa

Browse files
cspruiellcspruiell
committed
MC-16611: Fix Unrelated Static Test Failures
 - fix bugs
1 parent f2efb69 commit f3909aa

File tree

2 files changed

+32
-69
lines changed
  • app/code/Magento

2 files changed

+32
-69
lines changed

‎app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml

Lines changed: 22 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -22,48 +22,33 @@
2222
<form action="" method="post" id="backup-form" class="form-inline">
2323
<fieldset class="admin__fieldset form-list question">
2424
<div class="admin__field field _required">
25-
<label for="backup_name" class="admin__field-label"><span>
26-
<?= $block->escapeHtml(__('Backup Name')) ?>
27-
</span></label>
25+
<label for="backup_name" class="admin__field-label"><span><?= $block->escapeHtml(__('Backup Name')) ?></span></label>
2826
<div class="admin__field-control">
2927
<input type="text" name="backup_name" id="backup_name"
30-
class="admin__control-text required-entry validate-alphanum-with-spaces
31-
validate-length maximum-length-50"
28+
class="admin__control-text required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
3229
maxlength="50" />
3330
<div class="admin__field-note">
34-
<?= $block->escapeHtml(__('Please use only letters (a-z or A-Z), numbers (0-9) or spaces '
35-
. 'in this field.')) ?>
31+
<?= $block->escapeHtml(__('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.')) ?>
3632
</div>
3733
</div>
3834
</div>
3935

4036
<div class="admin__field field maintenance-checkbox-container">
41-
<label for="backup_maintenance_mode" class="admin__field-label"><span>
42-
<?= $block->escapeHtml(__('Maintenance mode')) ?>
43-
</span></label>
37+
<label for="backup_maintenance_mode" class="admin__field-label"><span><?= $block->escapeHtml(__('Maintenance mode')) ?></span></label>
4438
<div class="admin__field-control">
4539
<div class="admin__field-option">
46-
<input class="admin__control-checkbox" type="checkbox" name="maintenance_mode"
47-
value="1" id="backup_maintenance_mode"/>
48-
<label class="admin__field-label" for="backup_maintenance_mode">
49-
<?= $block->escapeHtml(__('Please put your store into maintenance mode during backup.')) ?>
50-
</label>
40+
<input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
41+
<label class="admin__field-label" for="backup_maintenance_mode"><?= $block->escapeHtml(__('Please put your store into maintenance mode during backup.')) ?></label>
5142
</div>
5243
</div>
5344
</div>
5445

55-
<div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container"
56-
style="display: none;">
57-
<label for="exclude_media" class="admin__field-label"><span>
58-
<?= $block->escapeHtml(__('Exclude')) ?>
59-
</span></label>
46+
<div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container" style="display: none;">
47+
<label for="exclude_media" class="admin__field-label"><span><?= $block->escapeHtml(__('Exclude')) ?></span></label>
6048
<div class="admin__field-control">
6149
<div class="admin__field-option">
62-
<input class="admin__control-checkbox" type="checkbox" name="exclude_media" value="1"
63-
id="exclude_media"/>
64-
<label class="admin__field-label" for="exclude_media">
65-
<?= $block->escapeHtml(__('Exclude media folder from backup')) ?>
66-
</label>
50+
<input class="admin__control-checkbox" type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
51+
<label class="admin__field-label" for="exclude_media"><?= $block->escapeHtml(__('Exclude media folder from backup')) ?></label>
6752
</div>
6853
</div>
6954
</div>
@@ -85,65 +70,44 @@
8570
<form action="" method="post" id="rollback-form" class="form-inline">
8671
<fieldset class="admin__fieldset password-box-container">
8772
<div class="admin__field field _required">
88-
<label for="password" class="admin__field-label"><span>
89-
<?= $block->escapeHtml(__('User Password')) ?>
90-
</span></label>
91-
<div class="admin__field-control">
92-
<input type="password" name="password" id="password" class="admin__control-text required-entry"
93-
autocomplete="new-password">
94-
</div>
73+
<label for="password" class="admin__field-label"><span><?= $block->escapeHtml(__('User Password')) ?></span></label>
74+
<div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="new-password"></div>
9575
</div>
9676

9777
<div class="admin__field field maintenance-checkbox-container">
98-
<label for="rollback_maintenance_mode" class="admin__field-label"><span>
99-
<?= $block->escapeHtml(__('Maintenance mode')) ?>
100-
</span></label>
78+
<label for="rollback_maintenance_mode" class="admin__field-label"><span><?= $block->escapeHtml(__('Maintenance mode')) ?></span></label>
10179
<div class="admin__field-control">
10280
<div class="admin__field-option">
103-
<input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1"
104-
id="rollback_maintenance_mode"/>
105-
<label class="admin__field-label" for="rollback_maintenance_mode">
106-
<?= $block->escapeHtml(__('Please put your store into maintenance mode during rollback '
107-
. 'processing.')) ?>
108-
</label>
81+
<input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>
82+
<label class="admin__field-label" for="rollback_maintenance_mode"><?= $block->escapeHtml(__('Please put your store into maintenance mode during rollback processing.')) ?></label>
10983
</div>
11084
</div>
11185
</div>
11286

113-
<div class="admin__field field maintenance-checkbox-container" id="use-ftp-checkbox-row"
114-
style="display: none;">
87+
<div class="admin__field field maintenance-checkbox-container" id="use-ftp-checkbox-row" style="display: none;">
11588
<label for="use_ftp" class="admin__field-label">
11689
<span><?= $block->escapeHtml(__('FTP')) ?></span>
11790
</label>
11891
<div class="admin__field-control">
11992
<div class="admin__field-option">
120-
<input class="admin__control-checkbox" type="checkbox" name="use_ftp" value="1" id="use_ftp"
121-
onclick="backup.toggleFtpCredentialsForm(event)"/>
122-
<label class="admin__field-label" for="use_ftp">
123-
<?= $block->escapeHtml(__('Use FTP Connection')) ?>
124-
</label>
93+
<input class="admin__control-checkbox" type="checkbox" name="use_ftp" value="1" id="use_ftp" onclick="backup.toggleFtpCredentialsForm(event)"/>
94+
<label class="admin__field-label" for="use_ftp"><?= $block->escapeHtml(__('Use FTP Connection')) ?></label>
12595
</div>
12696
</div>
12797
</div>
12898
</fieldset>
12999
<div class="entry-edit" id="ftp-credentials-container" style="display: none;">
130100
<fieldset class="admin__fieldset">
131-
<legend class="admin__legend legend"><span>
132-
<?= $block->escapeHtml(__('FTP credentials')) ?>
133-
</span></legend><br />
101+
<legend class="admin__legend legend"><span><?= $block->escapeHtml(__('FTP credentials')) ?></span></legend><br />
134102
<div class="admin__field field _required">
135-
<label class="admin__field-label" for="ftp_host"><span>
136-
<?= $block->escapeHtml(__('FTP Host')) ?>
137-
</span></label>
103+
<label class="admin__field-label" for="ftp_host"><span><?= $block->escapeHtml(__('FTP Host')) ?></span></label>
138104
<div class="admin__field-control">
139105
<input type="text" class="admin__control-text" name="ftp_host" id="ftp_host">
140106
</div>
141107
</div>
142108

143109
<div class="admin__field field _required">
144-
<label class="admin__field-label" for="ftp_user"><span>
145-
<?= $block->escapeHtml(__('FTP Login')) ?>
146-
</span></label>
110+
<label class="admin__field-label" for="ftp_user"><span><?= $block->escapeHtml(__('FTP Login')) ?></span></label>
147111
<div class="admin__field-control">
148112
<input type="text" class="admin__control-text" name="ftp_user" id="ftp_user">
149113
</div>
@@ -153,8 +117,7 @@
153117
<span><?= $block->escapeHtml(__('FTP Password')) ?></span>
154118
</label>
155119
<div class="admin__field-control">
156-
<input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass"
157-
autocomplete="new-password">
120+
<input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="new-password">
158121
</div>
159122
</div>
160123
<div class="admin__field field">

‎app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
4242
'prototype'
4343
], function (mageTemplate) {
4444
// create row creator
45-
window.arrayRow<?= $block->escapeHtml($_htmlId) ?> = {
45+
window.arrayRow<?= $block->escapeJs($_htmlId) ?> = {
4646

4747
// define row prototypeJS template
4848
template: mageTemplate(
4949
'<tr id="<%- _id %>">'
5050
<?php foreach ($block->getColumns() as $columnName => $column) : ?>
5151
+ '<td>'
52-
+ '<?= $block->escapeHtml($block->renderCellTemplate($columnName)) ?>'
52+
+ '<?= $block->escapeJs($block->renderCellTemplate($columnName)) ?>'
5353
+ '<\/td>'
5454
<?php endforeach; ?>
5555

@@ -60,7 +60,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
6060
<?php endif; ?>
6161

6262
+ '<td class="col-actions"><button '
63-
+ 'onclick="arrayRow<?= $block->escapeHtml($_htmlId) ?>.del(\'<%- _id %>\')" '
63+
+ 'onclick="arrayRow<?= $block->escapeJs($_htmlId) ?>.del(\'<%- _id %>\')" '
6464
+ 'class="action-delete" type="button">'
6565
+ '<span><?= $block->escapeHtml(__('Delete')) ?><\/span><\/button><\/td>'
6666
+ '<\/tr>'
@@ -77,7 +77,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
7777
var d = new Date();
7878
templateValues = {
7979
<?php foreach ($block->getColumns() as $columnName => $column) : ?>
80-
<?= $block->escapeHtml($columnName) ?>: '',
80+
<?= $block->escapeJs($columnName) ?>: '',
8181
'option_extra_attrs': {},
8282
<?php endforeach; ?>
8383
_id: '_' + d.getTime() + '_' + d.getMilliseconds()
@@ -88,7 +88,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
8888
if (insertAfterId) {
8989
Element.insert($(insertAfterId), {after: this.template(templateValues)});
9090
} else {
91-
Element.insert($('addRow<?= $block->escapeHtml($_htmlId) ?>'), {bottom: this.template(templateValues)});
91+
Element.insert($('addRow<?= $block->escapeJs($_htmlId) ?>'), {bottom: this.template(templateValues)});
9292
}
9393

9494
// Fill controls with data
@@ -113,23 +113,23 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
113113
}
114114

115115
// bind add action to "Add" button in last row
116-
Event.observe('addToEndBtn<?= $block->escapeHtml($_htmlId) ?>',
116+
Event.observe('addToEndBtn<?= $block->escapeJs($_htmlId) ?>',
117117
'click',
118-
arrayRow<?= $block->escapeHtml($_htmlId) ?>.add.bind(
119-
arrayRow<?= $block->escapeHtml($_htmlId) ?>, false, false
118+
arrayRow<?= $block->escapeJs($_htmlId) ?>.add.bind(
119+
arrayRow<?= $block->escapeJs($_htmlId) ?>, false, false
120120
)
121121
);
122122

123123
// add existing rows
124124
<?php
125125
foreach ($block->getArrayRows() as $_rowId => $_row) {
126-
echo $block->escapeHtml("arrayRow{$_htmlId}.add(" . $_row->toJson() . ");\n");
126+
echo "arrayRow{$block->escapeJs($_htmlId)}.add(" . $_row->toJson() . ");\n";
127127
}
128128
?>
129129

130130
// Toggle the grid availability, if element is disabled (depending on scope)
131131
<?php if ($block->getElement()->getDisabled()) : ?>
132-
toggleValueElements({checked: true}, $('grid<?= $block->escapeHtml($_htmlId) ?>').parentNode);
132+
toggleValueElements({checked: true}, $('grid<?= $block->escapeJs($_htmlId) ?>').parentNode);
133133
<?php endif; ?>
134134
});
135135
</script>

0 commit comments

Comments
 (0)