Skip to content

Commit c0bfb1c

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-43816' into BugFestW4
2 parents 8df4f1e + 62a15a8 commit c0bfb1c

File tree

2 files changed

+5
-2
lines changed
  • app/code/Magento
    • Catalog/view/adminhtml/web/js
    • ConfigurableProduct/view/adminhtml/web/js/variations/steps

2 files changed

+5
-2
lines changed

app/code/Magento/Catalog/view/adminhtml/web/js/options.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ define([
1111
'mage/template',
1212
'uiRegistry',
1313
'jquery/ui',
14-
'prototype'
14+
'prototype',
15+
'form',
16+
'validation'
1517
], function (jQuery, mageTemplate, rg) {
1618
'use strict';
1719

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ define([
1414
'mage/template',
1515
'Magento_Ui/js/modal/alert',
1616
'jquery/file-uploader',
17-
'mage/translate'
17+
'mage/translate',
18+
'Magento_ConfigurableProduct/js/variations/variations'
1819
], function (Component, $, ko, _, Collapsible, mageTemplate, alert) {
1920
'use strict';
2021

0 commit comments

Comments
 (0)