Skip to content

Commit 6378276

Browse files
VladimirZaetsVladimirZaets
committed
Merge pull request #569 from magento-webdev/bugs
[WebDev] Bugfixes
2 parents 95abd47 + 8e2057c commit 6378276

File tree

19 files changed

+143
-49
lines changed

19 files changed

+143
-49
lines changed

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php

-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ protected function createNewCategoryModal(array $meta)
104104
'config' => [
105105
'isTemplate' => false,
106106
'componentType' => 'modal',
107-
'dataScope' => 'data.new_category',
108107
'options' => [
109108
'title' => __('New Category'),
110109
],
@@ -193,7 +192,6 @@ protected function customizeCategoriesField(array $meta)
193192
'levelsVisibility' => '1',
194193
'elementTmpl' => 'ui/grid/filters/elements/ui-select',
195194
'options' => $this->getCategoriesTree(),
196-
'scopeLabel' => null,
197195
'listens' => [
198196
'index=create_category:responseData' => 'setParsed',
199197
'newOption' => 'toggleOptionSelected'

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

-3
Original file line numberDiff line numberDiff line change
@@ -259,14 +259,12 @@ protected function customizeNewDateRangeField(array $meta)
259259
if ($fromFieldPath && $toFieldPath) {
260260
$fromContainerPath = $this->arrayManager->slicePath($fromFieldPath, 0, -2);
261261
$toContainerPath = $this->arrayManager->slicePath($toFieldPath, 0, -2);
262-
$scopeLabel = $this->arrayManager->get($fromFieldPath . self::META_CONFIG_PATH . '/scopeLabel', $meta);
263262

264263
$meta = $this->arrayManager->merge(
265264
$fromFieldPath . self::META_CONFIG_PATH,
266265
$meta,
267266
[
268267
'label' => __('Set Product as New From'),
269-
'scopeLabel' => null,
270268
'additionalClasses' => 'admin__field-date',
271269
]
272270
);
@@ -287,7 +285,6 @@ protected function customizeNewDateRangeField(array $meta)
287285
'additionalClasses' => 'admin__control-grouped-date',
288286
'breakLine' => false,
289287
'component' => 'Magento_Ui/js/form/components/group',
290-
'scopeLabel' => $scopeLabel,
291288
]
292289
);
293290
$meta = $this->arrayManager->set(

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php

-3
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,12 @@ protected function customizeDateRangeField(array $meta)
6868
$toFieldPath = $this->arrayManager->findPath(self::CODE_CUSTOM_DESIGN_TO, $meta, null, 'children');
6969
$fromContainerPath = $this->arrayManager->slicePath($fromFieldPath, 0, -2);
7070
$toContainerPath = $this->arrayManager->slicePath($toFieldPath, 0, -2);
71-
$scopeLabel = $this->arrayManager->get($fromFieldPath . self::META_CONFIG_PATH . '/scopeLabel', $meta);
7271

7372
$meta = $this->arrayManager->merge(
7473
$fromFieldPath . self::META_CONFIG_PATH,
7574
$meta,
7675
[
7776
'label' => __('Schedule Update From'),
78-
'scopeLabel' => null,
7977
'additionalClasses' => 'admin__field-date',
8078
]
8179
);
@@ -96,7 +94,6 @@ protected function customizeDateRangeField(array $meta)
9694
'additionalClasses' => 'admin__control-grouped-date',
9795
'breakLine' => false,
9896
'component' => 'Magento_Ui/js/form/components/group',
99-
'scopeLabel' => $scopeLabel,
10097
]
10198
);
10299
$meta = $this->arrayManager->set(

‎app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -552,11 +552,11 @@
552552
<field name="custom_design_from">
553553
<argument name="data" xsi:type="array">
554554
<item name="config" xsi:type="array">
555+
<item name="label" xsi:type="string" translate="true">Schedule Update From</item>
555556
<item name="additionalClasses" xsi:type="string">admin__field-date</item>
556557
<item name="sortOrder" xsi:type="number">230</item>
557558
<item name="dataType" xsi:type="string">string</item>
558559
<item name="formElement" xsi:type="string">date</item>
559-
<item name="scopeLabel" xsi:type="string"/>
560560
<item name="imports" xsi:type="array">
561561
<item name="disabled" xsi:type="string">ns = ${ $.ns }, index = custom_use_parent_settings :checked</item>
562562
</item>

‎app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

+2
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ private function prepareMeta()
176176
'visible' => '1',
177177
'require' => '0',
178178
'additionalClasses' => 'admin__field-small',
179+
'label' => __('Quantity'),
180+
'scopeLabel' => '[GLOBAL]',
179181
'dataScope' => 'qty',
180182
'validation' => [
181183
'validate-number' => true,

‎app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

+21-1
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@
5050
<field name="manage_stock">
5151
<argument name="data" xsi:type="array">
5252
<item name="config" xsi:type="array">
53+
<item name="label" xsi:type="string" translate="true">Manage Stock</item>
5354
<item name="formElement" xsi:type="string">select</item>
5455
<item name="rawOptions" xsi:type="boolean">true</item>
5556
<item name="dataScope" xsi:type="string">manage_stock</item>
57+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
5658
<item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
5759
</item>
5860
<item name="options" xsi:type="object">Magento\Config\Model\Config\Source\Yesno</item>
@@ -122,8 +124,10 @@
122124
<field name="min_qty">
123125
<argument name="data" xsi:type="array">
124126
<item name="config" xsi:type="array">
127+
<item name="label" xsi:type="string" translate="true">Out-of-Stock Threshold</item>
125128
<item name="formElement" xsi:type="string">input</item>
126129
<item name="dataScope" xsi:type="string">min_qty</item>
130+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
127131
<item name="validation" xsi:type="array">
128132
<item name="validate-number" xsi:type="boolean">true</item>
129133
</item>
@@ -171,9 +175,11 @@
171175
<field name="min_sale_qty">
172176
<argument name="data" xsi:type="array">
173177
<item name="config" xsi:type="array">
178+
<item name="label" xsi:type="string" translate="true">Minimum Qty Allowed in Shopping Cart</item>
174179
<item name="component" xsi:type="string">Magento_CatalogInventory/js/components/qty-validator-changer</item>
175180
<item name="formElement" xsi:type="string">input</item>
176181
<item name="dataScope" xsi:type="string">min_sale_qty</item>
182+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
177183
<item name="validation" xsi:type="array">
178184
<item name="validate-number" xsi:type="boolean">true</item>
179185
<item name="validate-digits" xsi:type="boolean">true</item>
@@ -225,8 +231,10 @@
225231
<field name="max_sale_qty">
226232
<argument name="data" xsi:type="array">
227233
<item name="config" xsi:type="array">
234+
<item name="label" xsi:type="string" translate="true">Maximum Qty Allowed in Shopping Cart</item>
228235
<item name="formElement" xsi:type="string">input</item>
229236
<item name="dataScope" xsi:type="string">max_sale_qty</item>
237+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
230238
<item name="validation" xsi:type="array">
231239
<item name="validate-number" xsi:type="boolean">true</item>
232240
</item>
@@ -314,9 +322,11 @@
314322
<field name="backorders">
315323
<argument name="data" xsi:type="array">
316324
<item name="config" xsi:type="array">
325+
<item name="label" xsi:type="string" translate="true">Backorders</item>
317326
<item name="formElement" xsi:type="string">select</item>
318327
<item name="rawOptions" xsi:type="boolean">true</item>
319328
<item name="dataScope" xsi:type="string">backorders</item>
329+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
320330
<item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
321331
</item>
322332
<item name="options" xsi:type="object">Magento\CatalogInventory\Model\Source\Backorders</item>
@@ -353,7 +363,7 @@
353363
<item name="config" xsi:type="array">
354364
<item name="formElement" xsi:type="string">container</item>
355365
<item name="component" xsi:type="string">Magento_Ui/js/form/components/group</item>
356-
<item name="label" xsi:type="string" translate="true">Use deferred Stock update</item>
366+
<item name="label" xsi:type="string" translate="true">Use Deferred Stock Update</item>
357367
<item name="dataScope" xsi:type="string">stock_data</item>
358368
<item name="sortOrder" xsi:type="number">850</item>
359369
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
@@ -362,6 +372,8 @@
362372
<field name="deferred_stock_update">
363373
<argument name="data" xsi:type="array">
364374
<item name="config" xsi:type="array">
375+
<item name="label" xsi:type="string" translate="true">Use Deferred Stock Update</item>
376+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
365377
<item name="formElement" xsi:type="string">select</item>
366378
<item name="rawOptions" xsi:type="boolean">true</item>
367379
<item name="dataScope" xsi:type="string">deferred_stock_update</item>
@@ -413,7 +425,9 @@
413425
<field name="notify_stock_qty">
414426
<argument name="data" xsi:type="array">
415427
<item name="config" xsi:type="array">
428+
<item name="label" xsi:type="string" translate="true">Notify for Quantity Below</item>
416429
<item name="formElement" xsi:type="string">input</item>
430+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
417431
<item name="dataScope" xsi:type="string">notify_stock_qty</item>
418432
<item name="validation" xsi:type="array">
419433
<item name="validate-number" xsi:type="boolean">true</item>
@@ -462,8 +476,10 @@
462476
<field name="enable_qty_increments">
463477
<argument name="data" xsi:type="array">
464478
<item name="config" xsi:type="array">
479+
<item name="label" xsi:type="string" translate="true">Enable Qty Increments</item>
465480
<item name="formElement" xsi:type="string">select</item>
466481
<item name="rawOptions" xsi:type="boolean">true</item>
482+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
467483
<item name="dataScope" xsi:type="string">enable_qty_increments</item>
468484
<item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
469485
</item>
@@ -513,9 +529,11 @@
513529
<field name="qty_increments">
514530
<argument name="data" xsi:type="array">
515531
<item name="config" xsi:type="array">
532+
<item name="label" xsi:type="string" translate="true">Qty Increments</item>
516533
<item name="component" xsi:type="string">Magento_CatalogInventory/js/components/qty-validator-changer</item>
517534
<item name="formElement" xsi:type="string">input</item>
518535
<item name="dataScope" xsi:type="string">qty_increments</item>
536+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
519537
<item name="validation" xsi:type="array">
520538
<item name="validate-number" xsi:type="boolean">true</item>
521539
<item name="validate-digits" xsi:type="boolean">true</item>
@@ -570,6 +588,8 @@
570588
<field name="is_in_stock">
571589
<argument name="data" xsi:type="array">
572590
<item name="config" xsi:type="array">
591+
<item name="label" xsi:type="string" translate="true">Stock Status</item>
592+
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
573593
<item name="formElement" xsi:type="string">select</item>
574594
<item name="dataScope" xsi:type="string">is_in_stock</item>
575595
<item name="value" xsi:type="number">1</item>

‎app/code/Magento/Customer/view/frontend/templates/form/edit.phtml

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838

3939
<fieldset class="fieldset password" data-container="change-email-password">
4040
<legend class="legend"><span data-title="change-email-password"><?php /* @escapeNotVerified */ echo __('Change Email and Password') ?></span></legend><br>
41-
<div class="field password current required">
42-
<label class="label" for="current-password"><span><?php /* @escapeNotVerified */ echo __('Current Password') ?></span></label>
41+
<div class="field email required" data-container="change-email">
42+
<label class="label" for="email"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
4343
<div class="control">
44-
<input type="password" class="input-text" name="current_password" id="current-password" data-input="current-password" autocomplete="off" />
44+
<input type="email" name="email" id="email" autocomplete="email" data-input="change-email" value="<?php echo $block->escapeHtml($block->getCustomer()->getEmail()) ?>" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
4545
</div>
4646
</div>
47-
<div class="field email required" data-container="change-email">
48-
<label class="label" for="email"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
47+
<div class="field password current required">
48+
<label class="label" for="current-password"><span><?php /* @escapeNotVerified */ echo __('Current Password') ?></span></label>
4949
<div class="control">
50-
<input type="email" name="email" id="email" data-input="change-email" value="<?php echo $block->escapeHtml($block->getCustomer()->getEmail()) ?>" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
50+
<input type="password" class="input-text" name="current_password" id="current-password" data-input="current-password" autocomplete="off" />
5151
</div>
5252
</div>
5353
<div class="field new password required" data-container="new-password" data-mage-init='{"passwordStrengthIndicator": {}}'>

‎app/code/Magento/Customer/view/frontend/templates/form/register.phtml

+6-7
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
<input type="hidden" name="success_url" value="<?php /* @escapeNotVerified */ echo $block->getSuccessUrl() ?>">
2424
<input type="hidden" name="error_url" value="<?php /* @escapeNotVerified */ echo $block->getErrorUrl() ?>">
2525
<?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
26-
<div class="field required">
27-
<label for="email_address" class="label"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
28-
<div class="control">
29-
<input type="email" name="email" id="email_address" value="<?php echo $block->escapeHtml($block->getFormData()->getEmail()) ?>" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
30-
</div>
31-
</div>
3226
<?php if ($block->isNewsletterEnabled()): ?>
3327
<div class="field choice newsletter">
3428
<input type="checkbox" name="is_subscribed" title="<?php /* @escapeNotVerified */ echo __('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
@@ -136,7 +130,12 @@
136130
<?php endif; ?>
137131
<fieldset class="fieldset create account" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
138132
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Sign-in Information') ?></span></legend><br>
139-
133+
<div class="field required">
134+
<label for="email_address" class="label"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
135+
<div class="control">
136+
<input type="email" name="email" autocomplete="email" id="email_address" value="<?php echo $block->escapeHtml($block->getFormData()->getEmail()) ?>" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
137+
</div>
138+
</div>
140139
<div class="field password required" data-mage-init='{"passwordStrengthIndicator": {}}'>
141140
<label for="password" class="label"><span><?php /* @escapeNotVerified */ echo __('Password') ?></span></label>
142141
<div class="control">

0 commit comments

Comments
 (0)