Merge branch '2.0' into 2-0-8-backlog

xi-ao · Jul 12, 2016 · bfaeaf1 · bfaeaf1
2 parents 331f81e + 7508f98
commit bfaeaf1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
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');
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/_files/skip_blocks_ce.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/_files/skip_blocks_ce.php
@@ -15,8 +15,16 @@
     'Magento\Config\Block\System\Config\Form',
     'Magento\Config\Block\System\Config\Tabs',
     'Magento\Review\Block\Form',
+    'Magento\Braintree\Block\Form',
+    'Magento\Braintree\Block\Payment',
     // Fails because of dependence on registry
     'Magento\Reminder\Block\Adminhtml\Reminder\Edit\Tab\Customers',
     'Magento\LayeredNavigation\Block\Navigation',
     'Magento\LayeredNavigation\Block\Navigation\State',
+    // Other failures
+    'Magento\ProductAlert\Block\Email\Price',
+    'Magento\ProductAlert\Block\Email\Stock',
+    'Magento\ProductAlert\Block\Product\View',
+    'Magento\ProductAlert\Block\Product\View\Price',
+    'Magento\ProductAlert\Block\Product\View\Stock'
 ];