Merge remote-tracking branch 'origin/MC-5892' into 2.3-qwerty-pr48

Author: ameysar

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

@@ -362,6 +362,7 @@ protected function getCategoriesTree($filter = null)
 
             $categoryById[$category->getId()]['is_active'] = $category->getIsActive();
             $categoryById[$category->getId()]['label'] = $category->getName();
+            $categoryById[$category->getId()]['__disableTmpl'] = true;
             $categoryById[$category->getParentId()]['optgroup'][] = &$categoryById[$category->getId()];
         }
 

dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/expected_categories.php

@@ -10,68 +10,80 @@
             'value' => '2',
             'is_active' => '1',
             'label' => 'Default Category',
+            '__disableTmpl' => true,
             'optgroup' =>
                 [
                     0 => [
                         'value' => '3',
                         'is_active' => '1',
                         'label' => 'Category 1',
+                        '__disableTmpl' => true,
                         'optgroup' => [
                             0 => [
                                 'value' => '4',
                                 'is_active' => '1',
                                 'label' => 'Category 1.1',
+                                '__disableTmpl' => true,
                                 'optgroup' =>
                                     [
                                         0 =>
                                             [
                                                 'value' => '5',
                                                 'is_active' => '1',
                                                 'label' => 'Category 1.1.1',
+                                                '__disableTmpl' => true,
                                             ],
                                     ],
                             ],
                             1 => [
                                 'value' => '13',
                                 'is_active' => '1',
                                 'label' => 'Category 1.2',
+                                '__disableTmpl' => true,
                             ],
                         ],
                     ],
                     1 => [
                         'value' => '6',
                         'is_active' => '1',
                         'label' => 'Category 2',
+                        '__disableTmpl' => true,
                     ],
                     2 => [
                         'value' => '7',
                         'is_active' => '1',
                         'label' => 'Movable',
+                        '__disableTmpl' => true,
                     ],
                     3 => [
                         'value' => '8',
                         'is_active' => '0',
                         'label' => 'Inactive',
+                        '__disableTmpl' => true,
                     ],
                     4 => [
                         'value' => '9',
                         'is_active' => '1',
                         'label' => 'Movable Position 1',
+                        '__disableTmpl' => true,
                     ],
                     5 => [
                         'value' => '10',
                         'is_active' => '1',
                         'label' => 'Movable Position 2',
+                        '__disableTmpl' => true,
                     ],
                     6 => [
                         'value' => '11',
                         'is_active' => '1',
                         'label' => 'Movable Position 3',
+                        '__disableTmpl' => true,
                     ],
                     7 => [
                         'value' => '12',
                         'is_active' => '1',
                         'label' => 'Category 12',
+                        '__disableTmpl' => true,
                     ],
                 ],
         ],

dev/tests/integration/testsuite/Magento/Customer/Model/Config/Source/Group/MultiselectTest.php

@@ -35,22 +35,23 @@ public function testToOptionArray()
                 [
                     [
                         'value' => 1,
-                        'label' => 'Default (General)'
+                        'label' => 'Default (General)',
+                        '__disableTmpl' => true,
                     ],
                     [
                         'value' => 1,
                         'label' => 'General',
-                        '__disableTmpl' => true
+                        '__disableTmpl' => true,
                     ],
                     [
                         'value' => 2,
                         'label' => 'Wholesale',
-                        '__disableTmpl' => true
+                        '__disableTmpl' => true,
                     ],
                     [
                         'value' => 3,
                         'label' => 'Retailer',
-                        '__disableTmpl' => true
+                        '__disableTmpl' => true,
                     ],
                 ]
             );