Merge remote-tracking branch 'goinc/MAGETWO-36828' into prepared-pull-request

Author: Andrii Lugovyi

app/code/Magento/Catalog/Model/Plugin/FilterCustomAttribute.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Plugin for \Magento\Catalog\Model\Product\Attribute\Repository
+ *
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model\Plugin;
+
+use Magento\Catalog\Model\Product\Attribute\Repository;
+
+class FilterCustomAttribute
+{
+    /**
+     * @var array
+     */
+    private $blackList;
+
+    /**
+     * @param array $blackList
+     */
+    public function __construct(array $blackList = [])
+    {
+        $this->blackList = $blackList;
+    }
+
+    /**
+     * Delete custom attribute
+     *
+     * @param Repository $repository
+     * @param array $attributes
+     * @return \Magento\Eav\Model\AttributeRepository
+     * 
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetCustomAttributesMetadata(Repository $repository, array $attributes)
+    {
+        foreach ($attributes as $key => $attribute) {
+            if (in_array($attribute->getAttributeCode(), $this->blackList)) {
+                unset($attributes[$key]);
+            }
+        }
+
+        return $attributes;
+    }
+}

app/code/Magento/Catalog/etc/di.xml

@@ -46,6 +46,16 @@
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>
+    <type name="Magento\Catalog\Model\Product\Attribute\Repository">
+        <plugin name="filterCustomAttribute" type="Magento\Catalog\Model\Plugin\FilterCustomAttribute" />
+    </type>
+    <type name="Magento\Catalog\Model\Plugin\FilterCustomAttribute">
+        <arguments>
+            <argument name="blackList" xsi:type="array">
+                <item name="quantity_and_stock_status" xsi:type="string">quantity_and_stock_status</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Indexer\Model\Indexer\State">
         <plugin name="setStatusForIndexer" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\IndexerState" />
     </type>