Merge branch 'MAGETWO-50317' into develop

app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php

@@ -8,6 +8,13 @@ namespace Magento\Catalog\Controller\Adminhtml\Product;
 
 class SuggestAttributeSets extends \Magento\Backend\App\Action
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Catalog::sets';
+    
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
      */
@@ -47,3 +54,4 @@ class SuggestAttributeSets extends \Magento\Backend\App\Action
         return $resultJson;
     }
 }
+

app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php

@@ -6,8 +6,15 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-class SuggestAttributes extends \Magento\Catalog\Controller\Adminhtml\Product
+class SuggestAttributes extends \Magento\Backend\App\Action
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Catalog::attributes_attributes';
+
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
      */
@@ -26,11 +33,10 @@ class SuggestAttributes extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Catalog\Controller\Adminhtml\Product\Builder $productBuilder,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Framework\View\LayoutFactory $layoutFactory
     ) {
-        parent::__construct($context, $productBuilder);
+        parent::__construct($context);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
     }
@@ -51,3 +57,4 @@ class SuggestAttributes extends \Magento\Catalog\Controller\Adminhtml\Product
         return $resultJson;
     }
 }
+