Skip to content

Commit 14028aa

Browse files
MomotenkoNataliaMomotenkoNatalia
authored
Merge pull request #432 from magento-firedrakes/bugfixes
Fixed issues: - MAGETWO-58237: Order status history contains wrong data after creation of a Credit Memo - MAGETWO-58386: Eliminate dependencies on modules from lib/Magento - MAGETWO-55120: [GitHub] No category id on the category page #5467 - MAGETWO-55900: [GitHub] Translate messages on password strength #5509 #5883 #5861 - MAGETWO-50412: [GITHUB] Issues with adding groups on attribute set creation page (#3607)
2 parents f3e16fa + 525f5b4 commit 14028aa

File tree

48 files changed

+616
-268
lines changed

Some content is hidden

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

48 files changed

+616
-268
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/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/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
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ define([
88
'jquery',
99
'ko',
1010
'underscore',
11-
'sidebar'
11+
'sidebar',
12+
'mage/translate'
1213
], function (Component, customerData, $, ko, _) {
1314
'use strict';
1415

@@ -68,9 +69,7 @@ define([
6869
'qty': ':input.cart-item-qty',
6970
'button': ':button.update-cart-item'
7071
},
71-
'confirmMessage': $.mage.__(
72-
'Are you sure you would like to remove this item from the shopping cart?'
73-
)
72+
'confirmMessage': $.mage.__('Are you sure you would like to remove this item from the shopping cart?')
7473
});
7574
}
7675

‎app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ require([
2929
'jquery',
3030
'mage/template',
3131
'jquery/file-uploader',
32-
'domReady!'
32+
'domReady!',
33+
'mage/translate'
3334
], function ($, mageTemplate) {
3435
$('#<?php echo $block->getHtmlId() ?> .fileupload').fileupload({
3536
dataType: 'json',

‎app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ define([
88
'jquery',
99
'Magento_Ui/js/core/app',
1010
'underscore',
11-
'notification'
11+
'notification',
12+
'mage/translate'
1213
], function (Component, $, bootstrap, _) {
1314
'use strict';
1415

@@ -221,9 +222,7 @@ define([
221222

222223
if (data.items.length) {
223224
this.productsModal.notification('add', {
224-
message: $.mage.__(
225-
'Choose a new product to delete and replace the current product configuration.'
226-
),
225+
message: $.mage.__('Choose a new product to delete and replace the current product configuration.'),
227226
messageContainer: this.gridSelector
228227
});
229228
} else {

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,13 @@ define([
5151
this.setNotificationMessage();
5252
},
5353
setNotificationMessage: function () {
54+
/*eslint-disable max-len*/
55+
var msg = $.mage.__('When you remove or add an attribute, we automatically update all configurations and you will need to recreate current configurations manually.');
56+
57+
/*eslint-enable max-len*/
58+
5459
if (this.mode === 'edit') {
55-
this.wizard.setNotificationMessage($.mage.__('When you remove or add an attribute, we automatically ' +
56-
'update all configurations and you will need to recreate current configurations manually.'));
60+
this.wizard.setNotificationMessage(msg);
5761
}
5862
},
5963
doSelectSavedAttributes: function () {

‎app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ require([
104104
'mage/template',
105105
'jquery/file-uploader',
106106
'mage/mage',
107-
'prototype'
107+
'prototype',
108+
'mage/translate'
108109
], function(jQuery, registry, mageTemplate){
109110
registry.get('downloadable', function (Downloadable) {
110111
var linkTemplate = '<tr>'+

‎app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ require([
6363
'uiRegistry',
6464
'mage/template',
6565
'jquery/file-uploader',
66-
'prototype'
66+
'prototype',
67+
'mage/translate'
6768
], function (jQuery, registry, mageTemplate) {
6869
registry.get('downloadable', function (Downloadable) {
6970
var sampleTemplate = '<tr>'+

0 commit comments

Comments
 (0)