Skip to content

Commit ca6bdeb

Browse files
viktymviktym
committed
Merge remote-tracking branch 'magento2/develop' into MPI-PR-bugfixes
2 parents c4eab33 + 8007ad1 commit ca6bdeb

File tree

66 files changed

+959
-296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+959
-296
lines changed

‎app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,10 @@ public function execute()
9999
return $this->ajaxRequestResponse($category, $resultPage);
100100
}
101101

102+
$resultPageTitle = $categoryId ? $category->getName() . ' (ID: ' . $categoryId . ')' : __('Categories');
102103
$resultPage->setActiveMenu('Magento_Catalog::catalog_categories');
103104
$resultPage->getConfig()->getTitle()->prepend(__('Categories'));
104-
$resultPage->getConfig()->getTitle()->prepend($categoryId ? $category->getName() : __('Categories'));
105+
$resultPage->getConfig()->getTitle()->prepend($resultPageTitle);
105106
$resultPage->addBreadcrumb(__('Manage Catalog Categories'), __('Manage Categories'));
106107

107108
$block = $resultPage->getLayout()->getBlock('catalog.wysiwyg.js');

‎app/code/Magento/Catalog/Model/Product/Attribute/Repository.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,10 @@ public function save(\Magento\Catalog\Api\Data\ProductAttributeInterface $attrib
125125
$attribute->setFrontendInput($existingModel->getFrontendInput());
126126

127127
if (is_array($attribute->getFrontendLabels())) {
128-
$frontendLabel[0] = $existingModel->getDefaultFrontendLabel();
128+
$defaultFrontendLabel = $attribute->getDefaultFrontendLabel();
129+
$frontendLabel[0] = !empty($defaultFrontendLabel)
130+
? $defaultFrontendLabel
131+
: $existingModel->getDefaultFrontendLabel();
129132
foreach ($attribute->getFrontendLabels() as $item) {
130133
$frontendLabel[$item->getStoreId()] = $item->getLabel();
131134
}

‎app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\Catalog\Model\Product\Attribute\Repository;
1313
use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
1414
use Magento\Catalog\Api\Data\ProductAttributeInterface;
15+
use Magento\Eav\Api\Data\AttributeFrontendLabelInterface;
1516

1617
/**
1718
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -288,4 +289,42 @@ public function testSaveDoesNotSaveAttributeOptionsIfOptionsAreAbsentInPayload()
288289

289290
$this->model->save($attributeMock);
290291
}
292+
293+
public function testSaveSavesDefaultFrontendLabelIfItIsPresentInPayload()
294+
{
295+
$labelMock = $this->getMock(AttributeFrontendLabelInterface::class);
296+
$labelMock->expects($this->any())->method('getStoreId')->willReturn(1);
297+
$labelMock->expects($this->any())->method('getLabel')->willReturn('Store Scope Label');
298+
299+
$attributeId = 1;
300+
$attributeCode = 'existing_attribute_code';
301+
$attributeMock = $this->getMock(Attribute::class, [], [], '', false);
302+
$attributeMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
303+
$attributeMock->expects($this->any())->method('getAttributeId')->willReturn($attributeId);
304+
$attributeMock->expects($this->any())->method('getDefaultFrontendLabel')->willReturn('Default Label');
305+
$attributeMock->expects($this->any())->method('getFrontendLabels')->willReturn([$labelMock]);
306+
$attributeMock->expects($this->any())->method('getOptions')->willReturn([]);
307+
308+
309+
$existingModelMock = $this->getMock(Attribute::class, [], [], '', false);
310+
$existingModelMock->expects($this->any())->method('getAttributeId')->willReturn($attributeId);
311+
$existingModelMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
312+
313+
$this->eavAttributeRepositoryMock->expects($this->any())
314+
->method('get')
315+
->with(ProductAttributeInterface::ENTITY_TYPE_CODE, $attributeCode)
316+
->willReturn($existingModelMock);
317+
318+
$attributeMock->expects($this->once())
319+
->method('setDefaultFrontendLabel')
320+
->with(
321+
[
322+
0 => 'Default Label',
323+
1 => 'Store Scope Label'
324+
]
325+
);
326+
$this->attributeResourceMock->expects($this->once())->method('save')->with($attributeMock);
327+
328+
$this->model->save($attributeMock);
329+
}
291330
}

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@
208208
},
209209

210210
submit : function() {
211+
var i, child, newNode;
212+
211213
if( TreePanels.root.firstChild == TreePanels.root.lastChild ) {
212214
return;
213215
}
@@ -221,6 +223,7 @@
221223

222224
if( editSet.currentNode && editSet.currentNode.attributes.cls == 'folder' ) {
223225
TreePanels.root.removeChild(editSet.currentNode);
226+
224227
for( i in editSet.currentNode.childNodes ) {
225228
if( editSet.currentNode.childNodes[i].id ) {
226229
child = editSet.currentNode.childNodes[i];
@@ -231,12 +234,20 @@
231234
}
232235
}
233236
}
237+
234238
editSet.req.removeGroups[editSet.currentNode.id] = editSet.currentNode.id;
235239
editSet.currentNode = false;
236240
}
237241
},
238242

239243
SystemNodesExists : function(currentNode) {
244+
if (!currentNode) {
245+
alert({
246+
content: '<?php echo $block->escapeJs(__('Please select a node.')) ?>'
247+
});
248+
return;
249+
}
250+
240251
for (i in currentNode.childNodes) {
241252
if (currentNode.childNodes[i].id) {
242253
child = editSet.currentNode.childNodes[i];
@@ -253,31 +264,40 @@
253264

254265
addGroup : function() {
255266
prompt({
267+
title: "<?php /* @escapeNotVerified */ echo __('Add New Group') ?>",
256268
content: "<?php /* @escapeNotVerified */ echo __('Please enter a new group name.') ?>",
257269
value: "",
270+
validation: true,
271+
validationRules: ['required-entry'],
272+
attributesForm: {
273+
novalidate: 'novalidate',
274+
action: ''
275+
},
276+
attributesField: {
277+
name: 'name',
278+
'data-validate': '{required:true}',
279+
maxlength: '255'
280+
},
258281
actions: {
259282
confirm: function (group_name) {
260283
group_name = group_name.strip();
261-
if( group_name == '' ) {
262-
self.addGroup();
263-
} else if( group_name != false && group_name != null && group_name != '' ) {
264-
265-
if (!editSet.validateGroupName(group_name, 0)) {
266-
return;
267-
}
268-
269-
var newNode = new Ext.tree.TreeNode({
270-
text : group_name.escapeHTML(),
271-
cls : 'folder',
272-
allowDrop : true,
273-
allowDrag : true
274-
});
275-
TreePanels.root.appendChild(newNode);
276-
newNode.addListener('beforemove', editSet.groupBeforeMove);
277-
newNode.addListener('beforeinsert', editSet.groupBeforeInsert);
278-
newNode.addListener('beforeappend', editSet.groupBeforeInsert);
279-
newNode.addListener('click', editSet.register);
284+
285+
if (!editSet.validateGroupName(group_name, 0)) {
286+
return;
280287
}
288+
289+
var newNode = new Ext.tree.TreeNode({
290+
text : group_name.escapeHTML(),
291+
cls : 'folder',
292+
allowDrop : true,
293+
allowDrag : true
294+
});
295+
296+
TreePanels.root.appendChild(newNode);
297+
newNode.addListener('beforemove', editSet.groupBeforeMove);
298+
newNode.addListener('beforeinsert', editSet.groupBeforeInsert);
299+
newNode.addListener('beforeappend', editSet.groupBeforeInsert);
300+
newNode.addListener('click', editSet.register);
281301
}
282302
}
283303
});
@@ -302,7 +322,7 @@
302322
}
303323
for (var i=0; i < TreePanels.root.childNodes.length; i++) {
304324
if (TreePanels.root.childNodes[i].text.toLowerCase() == name.toLowerCase() && TreePanels.root.childNodes[i].id != exceptNodeId) {
305-
errorText = '<?php /* @escapeNotVerified */ echo __('An attribute group named "/name/" already exists".') ?>';
325+
errorText = '<?php /* @escapeNotVerified */ echo __('An attribute group named "/name/" already exists.') ?>';
306326
alert({
307327
content: errorText.replace("/name/",name)
308328
});

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ define([
66
'jquery',
77
'underscore',
88
'uiRegistry',
9-
'jquery/ui'
9+
'jquery/ui',
10+
'mage/translate'
1011
], function ($, _, registry) {
1112
'use strict';
1213

‎app/code/Magento/Catalog/view/adminhtml/web/component/image-size-field.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ define([
77
'jquery',
88
'Magento_Ui/js/lib/validation/utils',
99
'Magento_Ui/js/form/element/abstract',
10-
'Magento_Ui/js/lib/validation/validator'
10+
'Magento_Ui/js/lib/validation/validator',
11+
'mage/translate'
1112
], function ($, utils, Abstract, validator) {
1213
'use strict';
1314

‎app/code/Magento/Catalog/view/frontend/web/js/view/compare-products.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,31 @@
44
*/
55
define([
66
'uiComponent',
7-
'Magento_Customer/js/customer-data'
7+
'Magento_Customer/js/customer-data',
8+
'mage/translate'
89
], function (Component, customerData) {
910
'use strict';
1011

1112
var sidebarInitialized = false;
1213

1314
function initSidebar() {
1415
if (sidebarInitialized) {
15-
return ;
16+
return;
1617
}
1718
sidebarInitialized = true;
1819
require([
1920
'jquery',
2021
'mage/mage'
2122
], function ($) {
23+
/*eslint-disable max-len*/
2224
$('[data-role=compare-products-sidebar]').mage('compareItems', {
23-
"removeConfirmMessage": $.mage.__(
24-
"Are you sure you want to remove this item from your Compare Products list?"
25-
),
26-
"removeSelector": "#compare-items a.action.delete",
27-
"clearAllConfirmMessage": $.mage.__(
28-
"Are you sure you want to remove all items from your Compare Products list?"
29-
),
30-
"clearAllSelector": "#compare-clear-all"
25+
'removeConfirmMessage': $.mage.__('Are you sure you want to remove this item from your Compare Products list?'),
26+
'removeSelector': '#compare-items a.action.delete',
27+
'clearAllConfirmMessage': $.mage.__('Are you sure you want to remove all items from your Compare Products list?'),
28+
'clearAllSelector': '#compare-clear-all'
3129
});
30+
31+
/*eslint-enable max-len*/
3232
});
3333
}
3434

‎app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ define([], function () {
2121

2222
return {
2323
email: addressData.email,
24-
countryId: (addressData.country_id) ? addressData.country_id : window.checkoutConfig.defaultCountryId,
24+
countryId: addressData['country_id'] || addressData.countryId || window.checkoutConfig.defaultCountryId,
2525
regionId: regionId,
2626
regionCode: (addressData.region) ? addressData.region.region_code : null,
2727
region: (addressData.region) ? addressData.region.region : null,

‎app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ define(
1212
'../action/select-shipping-address',
1313
'./postcode-validator',
1414
'mage/translate',
15-
'uiRegistry'
15+
'uiRegistry',
16+
'Magento_Checkout/js/model/quote'
1617
],
1718
function (
1819
$,
@@ -22,7 +23,8 @@ define(
2223
selectShippingAddress,
2324
postcodeValidator,
2425
$t,
25-
uiRegistry
26+
uiRegistry,
27+
quote
2628
) {
2729
'use strict';
2830

@@ -41,7 +43,7 @@ define(
4143
* @param {Object} validator
4244
*/
4345
registerValidator: function (carrier, validator) {
44-
if (checkoutConfig.activeCarriers.indexOf(carrier) != -1) {
46+
if (checkoutConfig.activeCarriers.indexOf(carrier) !== -1) {
4547
validators.push(validator);
4648
}
4749
},
@@ -174,6 +176,7 @@ define(
174176
address;
175177

176178
if (this.validateAddressData(addressFlat)) {
179+
addressFlat = $.extend(true, {}, quote.shippingAddress(), addressFlat);
177180
address = addressConverter.formAddressDataToQuoteAddress(addressFlat);
178181
selectShippingAddress(address);
179182
}

‎app/code/Magento/Checkout/view/frontend/web/js/sidebar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ define([
224224

225225
if (msg) {
226226
alert({
227-
content: $.mage.__(msg)
227+
content: msg
228228
});
229229
}
230230
}

0 commit comments

Comments
 (0)