Merge pull request #102 from magento-troll/MAGETWO-53557

Oleksii Korshenko · web-flow · commit 1d77925774b9 · 2016-07-07T10:45:35.000-05:00
MAGETWO-53557: [Github] ACL Error - Admin user can't change the attributes set #4061
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php
@@ -46,4 +46,12 @@ public function execute()
         );
         return $resultJson;
     }
+
+    /**
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Catalog::products');
+    }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributes.php
@@ -50,4 +50,12 @@ public function execute()
         );
         return $resultJson;
     }
+
+    /**
+     * @return bool
+     */
+    protected function _isAllowed()
+    {
+        return $this->_authorization->isAllowed('Magento_Catalog::products');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,12 @@ public function execute()`
`46`	`46`	`);`
`47`	`47`	`return $resultJson;`
`48`	`48`	`}`
	`49`	`+`
	`50`	`+ /**`
	`51`	`+ * @return bool`
	`52`	`+ */`
	`53`	`+ protected function _isAllowed()`
	`54`	`+ {`
	`55`	`+ return $this->_authorization->isAllowed('Magento_Catalog::products');`
	`56`	`+ }`
`49`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,12 @@ public function execute()`
`50`	`50`	`);`
`51`	`51`	`return $resultJson;`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ /**`
	`55`	`+ * @return bool`
	`56`	`+ */`
	`57`	`+ protected function _isAllowed()`
	`58`	`+ {`
	`59`	`+ return $this->_authorization->isAllowed('Magento_Catalog::products');`
	`60`	`+ }`
`53`	`61`	`}`