Merge pull request #3899 from magento-tsg/2.1.18-develop-pr66

Alexander Akimov · web-flow · commit 09658091182e · 2019-03-14T18:51:56.000+02:00
[TSG] Backporting for 2.1 (pr66) (2.1.18-develop)
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php b/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php
@@ -68,7 +68,7 @@ protected function _isAllowed()
     {
         $sectionId = $this->_request->getParam('section');
         return parent::_isAllowed()
-            || $this->_configStructure->getElement($sectionId)->isAllowed();
+            && $this->_configStructure->getElement($sectionId)->isAllowed();
     }
 
     /**
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/Group.php
@@ -48,7 +48,15 @@ public function getAllOptions()
     {
         if (!$this->_options) {
             $groups = $this->_groupManagement->getLoggedInGroups();
+
             $this->_options = $this->_converter->toOptionArray($groups, 'id', 'code');
+
+            array_walk(
+                $this->_options,
+                function (&$item) {
+                    $item['__disableTmpl'] = true;
+                }
+            );
         }
         return $this->_options;
     }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
@@ -101,7 +101,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(\Magento\Customer\Api\Data\GroupInterface $group)
     {
@@ -152,7 +152,7 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getById($id)
     {
@@ -166,7 +166,7 @@ public function getById($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
@@ -308,6 +308,7 @@ public function deleteById($id)
      *
      * @param \Magento\Customer\Api\Data\GroupInterface $group
      * @throws InputException
+     * @throws \Zend_Validate_Exception
      * @return void
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/ColumnFactoryTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/ColumnFactoryTest.php
@@ -93,6 +93,7 @@ public function testCreate()
                         ]
                     ],
                     'component' => 'Magento_Ui/js/grid/columns/column',
+                    '__disableTmpl' => 'true',
                 ],
             ],
             'context' => $this->context,
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/FilterFactoryTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/FilterFactoryTest.php
@@ -72,6 +72,7 @@ public function testCreate()
                 'config' => [
                     'dataScope' => $filterName,
                     'label' => __('Label'),
+                    '__disableTmpl' => 'true',
                     'options' => [['value' => 'Value', 'label' => 'Label']],
                     'caption' => __('Select...'),
                 ],
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/AttributeRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/AttributeRepositoryTest.php
@@ -144,8 +144,9 @@ public function testGetList()
                     'options' => [
                         [
                             'label' => 'Label',
-                            'value' => 'Value'
-                        ]
+                            'value' => 'Value',
+                            '__disableTmpl' => true,
+                        ],
                     ],
                     'is_used_in_grid' => true,
                     'is_visible_in_grid' => true,
diff --git a/app/code/Magento/Customer/Ui/Component/ColumnFactory.php b/app/code/Magento/Customer/Ui/Component/ColumnFactory.php
@@ -9,6 +9,9 @@
 use Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater;
 use Magento\Customer\Api\CustomerMetadataInterface;
 
+/**
+ * Class ColumnFactory. Responsible for the column object generation.
+ */
 class ColumnFactory
 {
     /** @var \Magento\Framework\View\Element\UiComponentFactory  */
@@ -47,6 +50,8 @@ public function __construct(
     }
 
     /**
+     * Creates column object for grid ui component.
+     *
      * @param array $attributeData
      * @param string $columnName
      * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
@@ -55,13 +60,16 @@ public function __construct(
      */
     public function create(array $attributeData, $columnName, $context, array $config = [])
     {
+        // @codingStandardsIgnoreStart
         $config = array_merge([
             'label' => __($attributeData[AttributeMetadata::FRONTEND_LABEL]),
             'dataType' => $this->getDataType($attributeData[AttributeMetadata::FRONTEND_INPUT]),
             'align' => 'left',
             'visible' => (bool)$attributeData[AttributeMetadata::IS_VISIBLE_IN_GRID],
             'component' => $this->getJsComponent($this->getDataType($attributeData[AttributeMetadata::FRONTEND_INPUT])),
+            '__disableTmpl' => 'true',
         ], $config);
+        // @codingStandardsIgnoreEnd
         if ($attributeData[AttributeMetadata::FRONTEND_INPUT] == 'date') {
             $config['dateFormat'] = 'MMM d, y';
             $config['timezone'] = false;
@@ -93,6 +101,8 @@ public function create(array $attributeData, $columnName, $context, array $confi
     }
 
     /**
+     * Returns component map.
+     *
      * @param string $dataType
      * @return string
      */
@@ -102,6 +112,8 @@ protected function getJsComponent($dataType)
     }
 
     /**
+     * Returns component map depends on data type.
+     *
      * @param string $frontendType
      * @return string
      */
diff --git a/app/code/Magento/Customer/Ui/Component/FilterFactory.php b/app/code/Magento/Customer/Ui/Component/FilterFactory.php
@@ -7,6 +7,9 @@
 
 use Magento\Customer\Api\Data\AttributeMetadataInterface as AttributeMetadata;
 
+/**
+ * Class FilterFactory. Responsible for generation filter object.
+ */
 class FilterFactory
 {
     /**
@@ -34,16 +37,21 @@ public function __construct(\Magento\Framework\View\Element\UiComponentFactory $
     }
 
     /**
+     * Creates filter object.
+     *
      * @param array $attributeData
      * @param \Magento\Framework\View\Element\UiComponent\ContextInterface $context
      * @return \Magento\Ui\Component\Listing\Columns\ColumnInterface
      */
     public function create(array $attributeData, $context)
     {
+        // @codingStandardsIgnoreStart
         $config = [
             'dataScope' => $attributeData[AttributeMetadata::ATTRIBUTE_CODE],
             'label' => __($attributeData[AttributeMetadata::FRONTEND_LABEL]),
+            '__disableTmpl' => 'true',
         ];
+        // @codingStandardsIgnoreEnd
         if ($attributeData[AttributeMetadata::OPTIONS]) {
             $config['options'] = $attributeData[AttributeMetadata::OPTIONS];
             $config['caption'] = __('Select...');
@@ -63,6 +71,8 @@ public function create(array $attributeData, $context)
     }
 
     /**
+     * Returns filter type.
+     *
      * @param string $frontendInput
      * @return string
      */
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php b/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php
@@ -13,6 +13,9 @@
 use Magento\Customer\Api\MetadataManagementInterface;
 use Magento\Customer\Model\Indexer\Attribute\Filter;
 
+/**
+ * Class AttributeRepository
+ */
 class AttributeRepository
 {
     const BILLING_ADDRESS_PREFIX = 'billing_';
@@ -57,6 +60,8 @@ public function __construct(
     }
 
     /**
+     * Returns attribute list for current customer.
+     *
      * @return array
      */
     public function getList()
@@ -81,6 +86,8 @@ public function getList()
     }
 
     /**
+     * Returns attribute list for given entity type code.
+     *
      * @param AttributeMetadataInterface[] $metadata
      * @param string $entityTypeCode
      * @param MetadataManagementInterface $management
@@ -124,13 +131,19 @@ protected function getOptionArray(array $options)
     {
         /** @var \Magento\Customer\Api\Data\OptionInterface $option */
         foreach ($options as &$option) {
-            $option = ['label' => (string)$option->getLabel(), 'value' => $option->getValue()];
+            $option = [
+                'label' => (string)$option->getLabel(),
+                'value' => $option->getValue(),
+                '__disableTmpl' => true,
+            ];
         }
+
         return $options;
     }
 
-
     /**
+     * Return customer group's metadata by given group code.
+     *
      * @param string $code
      * @return []
      */
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php
@@ -43,6 +43,11 @@ public function toOptionArray()
         if ($this->options === null) {
             $this->options = $this->collectionFactory->create()->toOptionArray();
         }
+
+        array_walk($this->options, function (&$item) {
+            $item['__disableTmpl'] = true;
+        });
+
         return $this->options;
     }
 }
diff --git a/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php b/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
@@ -87,7 +87,8 @@ public function jsonSerialize()
             foreach ($options as $optionCode) {
                 $this->options[$optionCode['value']] = [
                     'type' => 'customer_group_' . $optionCode['value'],
-                    'label' => $optionCode['label'],
+                    'label' => __($optionCode['label']),
+                    '__disableTmpl' => true,
                 ];
 
                 if ($this->urlPath && $this->paramName) {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -94,13 +94,14 @@ protected function _construct()
                         if( response.error ) {
                             alert(response.message);
                         } else if( response.id ){
+                            var productName = response.name;
                             $("product_id").value = response.id;
 
                             $("product_name").innerHTML = \'<a href="' .
             $this->getUrl(
                 'catalog/product/edit'
             ) .
-            'id/\' + response.id + \'" target="_blank">\' + response.name + \'</a>\';
+            'id/\' + response.id + \'" target="_blank">\' + productName.escapeHTML() + \'</a>\';
                         } else if ( response.message ) {
                             alert(response.message);
                         }
diff --git a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/Status/OptionsTest.php b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/Status/OptionsTest.php
@@ -10,7 +10,7 @@
 use Magento\Sales\Ui\Component\Listing\Column\Status\Options;
 
 /**
- * Class OptionsTest
+ * Class OptionsTest for Magento\Sales\Ui\Component\Listing\Column\Status\Options.
  */
 class OptionsTest extends \PHPUnit_Framework_TestCase
 {
@@ -24,35 +24,62 @@ class OptionsTest extends \PHPUnit_Framework_TestCase
      */
     protected $collectionFactoryMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
         $this->collectionFactoryMock = $this->getMock(
-            'Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory',
+            \Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory::class,
             ['create'],
             [],
             '',
             false
         );
         $this->model = $objectManager->getObject(
-            'Magento\Sales\Ui\Component\Listing\Column\Status\Options',
+            \Magento\Sales\Ui\Component\Listing\Column\Status\Options::class,
             ['collectionFactory' => $this->collectionFactoryMock]
         );
     }
 
+    /**
+     * Unit test for toOptionArray method.
+     *
+     * @return void
+     */
     public function testToOptionArray()
     {
-        $collectionMock =
-            $this->getMock('Magento\Sales\Model\ResourceModel\Order\Status\Collection', [], [], '', false);
-        $options = ['options'];
+        $collectionMock = $this->getMock(
+            \Magento\Sales\Model\ResourceModel\Order\Status\Collection::class,
+            [],
+            [],
+            '',
+            false
+        );
+
+        $options = [
+            [
+                'value' => '1',
+                'label' => 'Label',
+            ],
+        ];
+
+        $expectedOptions = [
+            [
+                'value' => '1',
+                'label' => 'Label',
+                '__disableTmpl' => true,
+            ],
+        ];
 
         $this->collectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($collectionMock);
         $collectionMock->expects($this->once())
             ->method('toOptionArray')
             ->willReturn($options);
-        $this->assertEquals($options, $this->model->toOptionArray());
-        $this->assertEquals($options, $this->model->toOptionArray());
+
+        $this->assertEquals($expectedOptions, $this->model->toOptionArray());
     }
 }
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status/Options.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status/Options.php
@@ -3,13 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Ui\Component\Listing\Column\Status;
 
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory;
 
 /**
- * Class Options
+ * Class to transform Status options into a form of value-label pairs.
  */
 class Options implements OptionSourceInterface
 {
@@ -24,8 +25,6 @@ class Options implements OptionSourceInterface
     protected $collectionFactory;
 
     /**
-     * Constructor
-     *
      * @param CollectionFactory $collectionFactory
      */
     public function __construct(CollectionFactory $collectionFactory)
@@ -34,15 +33,22 @@ public function __construct(CollectionFactory $collectionFactory)
     }
 
     /**
-     * Get options
+     * Get options into array.
      *
      * @return array
      */
     public function toOptionArray()
     {
         if ($this->options === null) {
-            $this->options = $this->collectionFactory->create()->toOptionArray();
+            $options = $this->collectionFactory->create()->toOptionArray();
+
+            array_walk($options, function (&$option) {
+                $option['__disableTmpl'] = true;
+            });
+
+            $this->options = $options;
         }
+
         return $this->options;
     }
 }
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php
diff --git a/lib/web/mage/utils/template.js b/lib/web/mage/utils/template.js

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected function _isAllowed()`
`68`	`68`	`{`
`69`	`69`	`$sectionId = $this->_request->getParam('section');`
`70`	`70`	`return parent::_isAllowed()`
`71`		`- \|\| $this->_configStructure->getElement($sectionId)->isAllowed();`
	`71`	`+ && $this->_configStructure->getElement($sectionId)->isAllowed();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,15 @@ public function getAllOptions()`
`48`	`48`	`{`
`49`	`49`	`if (!$this->_options) {`
`50`	`50`	`$groups = $this->_groupManagement->getLoggedInGroups();`
	`51`	`+`
`51`	`52`	`$this->_options = $this->_converter->toOptionArray($groups, 'id', 'code');`
	`53`	`+`
	`54`	`+ array_walk(`
	`55`	`+ $this->_options,`
	`56`	`+ function (&$item) {`
	`57`	`+ $item['__disableTmpl'] = true;`
	`58`	`+ }`
	`59`	`+ );`
`52`	`60`	`}`
`53`	`61`	`return $this->_options;`
`54`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public function __construct(`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/**`
`104`		`- * {@inheritdoc}`
	`104`	`+ * @inheritdoc`
`105`	`105`	`*/`
`106`	`106`	`public function save(\Magento\Customer\Api\Data\GroupInterface $group)`
`107`	`107`	`{`
`@@ -152,7 +152,7 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`/**`
`155`		`- * {@inheritdoc}`
	`155`	`+ * @inheritdoc`
`156`	`156`	`*/`
`157`	`157`	`public function getById($id)`
`158`	`158`	`{`
`@@ -166,7 +166,7 @@ public function getById($id)`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`/**`
`169`		`- * {@inheritdoc}`
	`169`	`+ * @inheritdoc`
`170`	`170`	`*/`
`171`	`171`	`public function getList(SearchCriteriaInterface $searchCriteria)`
`172`	`172`	`{`
`@@ -308,6 +308,7 @@ public function deleteById($id)`
`308`	`308`	`*`
`309`	`309`	`* @param \Magento\Customer\Api\Data\GroupInterface $group`
`310`	`310`	`* @throws InputException`
	`311`	`+ * @throws \Zend_Validate_Exception`
`311`	`312`	`* @return void`
`312`	`313`	`*`
`313`	`314`	`* @SuppressWarnings(PHPMD.NPathComplexity)`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ public function testCreate()`
`93`	`93`	`]`
`94`	`94`	`],`
`95`	`95`	`'component' => 'Magento_Ui/js/grid/columns/column',`
	`96`	`+ '__disableTmpl' => 'true',`
`96`	`97`	`],`
`97`	`98`	`],`
`98`	`99`	`'context' => $this->context,`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,11 @@ public function toOptionArray()`
`43`	`43`	`if ($this->options === null) {`
`44`	`44`	`$this->options = $this->collectionFactory->create()->toOptionArray();`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ array_walk($this->options, function (&$item) {`
	`48`	`+ $item['__disableTmpl'] = true;`
	`49`	`+ });`
	`50`	`+`
`46`	`51`	`return $this->options;`
`47`	`52`	`}`
`48`	`53`	`}`