From c2fd9b1c1f88fd42f8ce0c7d3d3d72bfb4335b3d Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Fri, 26 Jul 2019 09:59:57 -0500 Subject: [PATCH 1/7] MC-17485: Catalog Product Attribute Set Name --- .../DataProvider/Product/Form/Modifier/AttributeSet.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php index 0733d21bf47d7..3420965597c5e 100644 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php @@ -78,7 +78,13 @@ public function getOptions() \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::SORT_ORDER_ASC ); - return $collection->getData(); + $collectionData = $collection->getData(); + + array_walk($collectionData, function (&$attribute) { + $attribute['__disableTmpl'] = true; + }); + + return $collectionData; } /** From dddd789723b7f6e8be2f5197a58a8fbc5335b43f Mon Sep 17 00:00:00 2001 From: Hwashiang Yu Date: Mon, 29 Jul 2019 13:20:42 -0500 Subject: [PATCH 2/7] MC-18722: Customer Inline editor option error - Resolved incorrect template disabling - Updated template render logic during recursive render --- app/code/Magento/Ui/view/base/web/js/grid/editing/record.js | 5 ----- lib/web/mage/utils/template.js | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js index 364a4769f2537..390aedf193b91 100644 --- a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js +++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js @@ -134,11 +134,6 @@ define([ field = utils.extend({}, fields.base, field); - field.__disableTmpl = { - label: true, - options: true - }; - return utils.template(field, { record: this, column: column diff --git a/lib/web/mage/utils/template.js b/lib/web/mage/utils/template.js index fa44b719dc564..4ee36629f6dc5 100644 --- a/lib/web/mage/utils/template.js +++ b/lib/web/mage/utils/template.js @@ -131,7 +131,9 @@ define([ cycles = 0; while (~tmpl.indexOf(opener) && (typeof maxCycles === 'undefined' || cycles < maxCycles)) { - tmpl = template(tmpl, data); + if (!isTmplIgnored(tmpl, data)) { + tmpl = template(tmpl, data); + } if (tmpl === last) { break; From b75c4e6e687e84dd7d5f296f2ebe9345c7815738 Mon Sep 17 00:00:00 2001 From: Joan He Date: Mon, 29 Jul 2019 15:59:20 -0500 Subject: [PATCH 3/7] MC-18126: Email template improvement --- lib/internal/Magento/Framework/Filter/Template.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php index f8b6b59d5ee82..cffe26b71ac24 100644 --- a/lib/internal/Magento/Framework/Filter/Template.php +++ b/lib/internal/Magento/Framework/Filter/Template.php @@ -72,16 +72,16 @@ class Template implements \Zend_Filter_Interface 'getdatausingmethod', '__destruct', '__call', - '__callStatic', + '__callstatic', '__set', '__unset', '__sleep', '__wakeup', '__invoke', '__set_state', - '__debugInfo', - '___callParent', - '___callPlugins' + '__debuginfo', + '___callparent', + '___callplugins' ]; /** From 576047b3c83ddf712a688c43c4bee47a2fa93560 Mon Sep 17 00:00:00 2001 From: Dan Mooney Date: Mon, 29 Jul 2019 17:07:01 -0500 Subject: [PATCH 4/7] MC-17485: Catalog Product Attribute Set Name --- .../Ui/DataProvider/Product/Form/Modifier/AttributeSet.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php index 3420965597c5e..474b139810267 100644 --- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php +++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php @@ -78,7 +78,7 @@ public function getOptions() \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::SORT_ORDER_ASC ); - $collectionData = $collection->getData(); + $collectionData = $collection->getData() ?? []; array_walk($collectionData, function (&$attribute) { $attribute['__disableTmpl'] = true; From d06e75f9ffb07ad808d7e83810c96f4609b810d2 Mon Sep 17 00:00:00 2001 From: Hwashiang Yu Date: Mon, 29 Jul 2019 18:41:46 -0500 Subject: [PATCH 5/7] MC-18722: Customer Inline editor option error - Resolved funtional test failures --- lib/web/mage/utils/template.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/web/mage/utils/template.js b/lib/web/mage/utils/template.js index 4ee36629f6dc5..0f94b42616f2c 100644 --- a/lib/web/mage/utils/template.js +++ b/lib/web/mage/utils/template.js @@ -40,7 +40,7 @@ define([ * To limit recursion for a specific property add __disableTmpl: {propertyName: numberOfCycles}. * * @param {String} tmpl - * @param {Object} target + * @param {Object|undefined} target * @returns {Boolean|Object} */ function isTmplIgnored(tmpl, target) { @@ -131,7 +131,7 @@ define([ cycles = 0; while (~tmpl.indexOf(opener) && (typeof maxCycles === 'undefined' || cycles < maxCycles)) { - if (!isTmplIgnored(tmpl, data)) { + if (!isTmplIgnored(tmpl)) { tmpl = template(tmpl, data); } From 1ee05be91ca9fd7b21c852ccff3099be2f296efe Mon Sep 17 00:00:00 2001 From: Raoul Rego Date: Tue, 30 Jul 2019 17:51:49 -0500 Subject: [PATCH 6/7] MC-18791: Fix magento/composer version in composer.json for 2.2.10 - Fixed versions of magento/composer and set minimum stability to stable --- composer.json | 10 ++-------- composer.lock | 31 ++++++++++--------------------- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 548b7dbf7e211..3437aed663c6a 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "phpseclib/mcrypt_compat": "1.0.8", "phpseclib/phpseclib": "2.0.*", "tedivm/jshrink": "~1.3.0", - "magento/composer": "1.2.x-dev as 1.2.1", + "magento/composer": "~1.2.0", "lib-libxml": "*", "ext-ctype": "*", "ext-gd": "*", @@ -274,11 +274,5 @@ } }, "prefer-stable": true, - "minimum-stability": "dev", - "repositories": { - "magento.composer": { - "type": "vcs", - "url": "https://github.com/magento/composer.git" - } - } + "minimum-stability": "stable" } diff --git a/composer.lock b/composer.lock index ef4accdd13666..8949f31e98d3b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1451a5f0e75accb1dde62d4118dbe928", + "content-hash": "92b8c1f29c7180ee86e5afe4c4d9b934", "packages": [ { "name": "braintree/braintree_php", @@ -553,22 +553,22 @@ }, { "name": "magento/composer", - "version": "1.2.x-dev", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/magento/composer.git", - "reference": "6b406bc65690c1b28be9255249507e1c6572d815" + "reference": "0a37e32781f905e217380f15fca10a727a80fd25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/magento/composer/zipball/6b406bc65690c1b28be9255249507e1c6572d815", - "reference": "6b406bc65690c1b28be9255249507e1c6572d815", + "url": "https://api.github.com/repos/magento/composer/zipball/0a37e32781f905e217380f15fca10a727a80fd25", + "reference": "0a37e32781f905e217380f15fca10a727a80fd25", "shasum": "" }, "require": { "composer/composer": "1.4.1", "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0|~7.2.0", - "symfony/console": "~2.3, !=2.7.0" + "symfony/console": "~2.3 || ~3.4 || ~4.2, !=2.7.0" }, "require-dev": { "phpunit/phpunit": "4.1.0" @@ -579,16 +579,13 @@ "Magento\\Composer\\": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "OSL-3.0", "AFL-3.0" ], "description": "Magento composer library helps to instantiate Composer application and run composer commands.", - "support": { - "source": "https://github.com/magento/composer/tree/1.2", - "issues": "https://github.com/magento/composer/issues" - }, - "time": "2019-05-21T16:03:27+00:00" + "time": "2019-07-30T19:45:16+00:00" }, { "name": "magento/magento-composer-installer", @@ -9183,17 +9180,9 @@ "time": "2018-12-25T11:19:39+00:00" } ], - "aliases": [ - { - "alias": "1.2.1", - "alias_normalized": "1.2.1.0", - "version": "1.2.9999999.9999999-dev", - "package": "magento/composer" - } - ], - "minimum-stability": "dev", + "aliases": [], + "minimum-stability": "stable", "stability-flags": { - "magento/composer": 20, "phpmd/phpmd": 0 }, "prefer-stable": true, From b663d75bbc1813489e690b0b2f4824c9f192f410 Mon Sep 17 00:00:00 2001 From: Raoul Rego Date: Wed, 31 Jul 2019 14:06:13 -0500 Subject: [PATCH 7/7] MC-18791: Fix magento/composer version in composer.json for 2.2.10 - Removed prefer-stable --- composer.json | 1 - composer.lock | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 3437aed663c6a..69c34d890ad11 100644 --- a/composer.json +++ b/composer.json @@ -273,6 +273,5 @@ "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/" } }, - "prefer-stable": true, "minimum-stability": "stable" } diff --git a/composer.lock b/composer.lock index 8949f31e98d3b..2e66c243cb722 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "92b8c1f29c7180ee86e5afe4c4d9b934", + "content-hash": "a600fea79a381a8fd87375f8d984b9e5", "packages": [ { "name": "braintree/braintree_php", @@ -9185,7 +9185,7 @@ "stability-flags": { "phpmd/phpmd": 0 }, - "prefer-stable": true, + "prefer-stable": false, "prefer-lowest": false, "platform": { "php": "~7.0.13|~7.1.0|~7.2.0",