Skip to content

Commit 4992141

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #22499: [Backport] Fixed Dependency on Backup Settings Configuration (by @keyuremipro) - #22358: [Backport] Previous scrolling to invalid form element is not being canceled on h� (by @amol2jcommerce) Fixed GitHub Issues: - #22474: Incomplete Dependency on Backup Settings Configuration (reported by @keyuremipro) has been fixed in #22499 by @keyuremipro in 2.2-develop branch Related commits: 1. bd0613a - #21715: Previous scrolling to invalid form element is not being canceled on hitting submit multiple times (reported by @lukeromanowicz) has been fixed in #22358 by @amol2jcommerce in 2.2-develop branch Related commits: 1. bcc4526
2 parents 1e29a6c + 2e0aa0f commit 4992141

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

app/code/Magento/Backup/etc/adminhtml/system.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,22 @@
2626
<label>Scheduled Backup Type</label>
2727
<depends>
2828
<field id="enabled">1</field>
29+
<field id="functionality_enabled">1</field>
2930
</depends>
3031
<source_model>Magento\Backup\Model\Config\Source\Type</source_model>
3132
</field>
3233
<field id="time" translate="label" type="time" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
3334
<label>Start Time</label>
3435
<depends>
3536
<field id="enabled">1</field>
37+
<field id="functionality_enabled">1</field>
3638
</depends>
3739
</field>
3840
<field id="frequency" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
3941
<label>Frequency</label>
4042
<depends>
4143
<field id="enabled">1</field>
44+
<field id="functionality_enabled">1</field>
4245
</depends>
4346
<source_model>Magento\Cron\Model\Config\Source\Frequency</source_model>
4447
<backend_model>Magento\Backup\Model\Config\Backend\Cron</backend_model>
@@ -48,6 +51,7 @@
4851
<comment>Please put your store into maintenance mode during backup.</comment>
4952
<depends>
5053
<field id="enabled">1</field>
54+
<field id="functionality_enabled">1</field>
5155
</depends>
5256
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
5357
</field>

lib/web/mage/validation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1948,7 +1948,7 @@
19481948
}
19491949

19501950
if (firstActive.length) {
1951-
$('html, body').animate({
1951+
$('html, body').stop().animate({
19521952
scrollTop: firstActive.offset().top
19531953
});
19541954
firstActive.focus();

0 commit comments

Comments
 (0)