MAGETWO-61274: Admin user with access only to Catalog cannot create configurable product

Author: slopukhov

app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/SelectAttributes.php

@@ -17,7 +17,7 @@ class SelectAttributes extends \Magento\Ui\Block\Component\StepsWizard\StepAbstr
      *
      * @var \Magento\Framework\Registry
      */
-    protected $coreRegistry = null;
+    protected $registry = null;
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
@@ -43,31 +43,35 @@ public function getAddNewAttributeButton($dataProvider = '')
         $attributeCreate = $this->getLayout()->createBlock(
             \Magento\Backend\Block\Widget\Button::class
         );
-        $attributeCreate->setDataAttribute(
-            [
-                'mage-init' => [
-                    'productAttributes' => [
-                        'dataProvider' => $dataProvider,
-                        'url' => $this->getUrl('catalog/product_attribute/new', [
-                            'store' => $this->registry->registry('current_product')->getStoreId(),
-                            'product_tab' => 'variations',
-                            'popup' => 1,
-                            '_query' => [
-                                'attribute' => [
-                                    'is_global' => 1,
-                                    'frontend_input' => 'select',
+        if ($attributeCreate->getAuthorization()->isAllowed('Magento_Catalog::attributes_attributes')) {
+            $attributeCreate->setDataAttribute(
+                [
+                    'mage-init' => [
+                        'productAttributes' => [
+                            'dataProvider' => $dataProvider,
+                            'url' => $this->getUrl('catalog/product_attribute/new', [
+                                'store' => $this->registry->registry('current_product')->getStoreId(),
+                                'product_tab' => 'variations',
+                                'popup' => 1,
+                                '_query' => [
+                                    'attribute' => [
+                                        'is_global' => 1,
+                                        'frontend_input' => 'select',
+                                    ],
                                 ],
-                            ],
-                        ]),
+                            ]),
+                        ],
                     ],
-                ],
-            ]
-        )->setType(
-            'button'
-        )->setLabel(
-            __('Create New Attribute')
-        );
-        return $attributeCreate->toHtml();
+                ]
+            )->setType(
+                'button'
+            )->setLabel(
+                __('Create New Attribute')
+            );
+            return $attributeCreate->toHtml();
+        } else {
+            return '';
+        }
     }
 
     /**

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php

@@ -16,7 +16,7 @@ class CreateOptions extends Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Catalog::attributes_attributes';
+    const ADMIN_RESOURCE = 'Magento_Catalog::products';
 
     /**
      * @var \Magento\Framework\Json\Helper\Data

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/GetAttributes.php

@@ -16,7 +16,7 @@ class GetAttributes extends Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Catalog::attributes_attributes';
+    const ADMIN_RESOURCE = 'Magento_Catalog::products';
 
     /**
      * Store manager

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php

@@ -16,7 +16,7 @@ class SuggestConfigurableAttributes extends Action
      *
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Catalog::attributes_attributes';
+    const ADMIN_RESOURCE = 'Magento_Catalog::products';
 
     /**
      * @var \Magento\ConfigurableProduct\Model\SuggestedAttributeList