Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.2-develop
Browse files Browse the repository at this point in the history
Accepted Public Pull Requests:
 - magento#22499: [Backport] Fixed Dependency on Backup Settings Configuration (by @keyuremipro)
 - magento#22358: [Backport] Previous scrolling to invalid form element is not being canceled on h� (by @amol2jcommerce)


Fixed GitHub Issues:
 - magento#22474: Incomplete Dependency on Backup Settings Configuration (reported by @keyuremipro) has been fixed in magento#22499 by @keyuremipro in 2.2-develop branch
   Related commits:
     1. bd0613a

 - magento#21715: Previous scrolling to invalid form element is not being canceled on hitting submit multiple times (reported by @lukeromanowicz) has been fixed in magento#22358 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. bcc4526
  • Loading branch information
magento-engcom-team authored Apr 26, 2019
2 parents 1e29a6c + 2e0aa0f commit 4992141
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions app/code/Magento/Backup/etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,22 @@
<label>Scheduled Backup Type</label>
<depends>
<field id="enabled">1</field>
<field id="functionality_enabled">1</field>
</depends>
<source_model>Magento\Backup\Model\Config\Source\Type</source_model>
</field>
<field id="time" translate="label" type="time" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Start Time</label>
<depends>
<field id="enabled">1</field>
<field id="functionality_enabled">1</field>
</depends>
</field>
<field id="frequency" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Frequency</label>
<depends>
<field id="enabled">1</field>
<field id="functionality_enabled">1</field>
</depends>
<source_model>Magento\Cron\Model\Config\Source\Frequency</source_model>
<backend_model>Magento\Backup\Model\Config\Backend\Cron</backend_model>
Expand All @@ -48,6 +51,7 @@
<comment>Please put your store into maintenance mode during backup.</comment>
<depends>
<field id="enabled">1</field>
<field id="functionality_enabled">1</field>
</depends>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
Expand Down
2 changes: 1 addition & 1 deletion lib/web/mage/validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -1948,7 +1948,7 @@
}

if (firstActive.length) {
$('html, body').animate({
$('html, body').stop().animate({
scrollTop: firstActive.offset().top
});
firstActive.focus();
Expand Down

0 comments on commit 4992141

Please sign in to comment.