Merge remote-tracking branch 'origin/MAGETWO-57165' into 2.0-develop-pr6

Author: zakdma

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/product-grid.js

@@ -30,7 +30,8 @@ define([
             listens: {
                 '${ $.productsProvider }:data': '_showMessageAssociatedGrid _handleManualGridOpening',
                 '${ $.productsMassAction }:selected': '_handleManualGridSelect',
-                '${ $.configurableVariations }:productMatrix': '_showButtonAddManual _switchProductType'
+                '${ $.configurableVariations }:productMatrix': '_switchProductType',
+                '${ $.configurableVariations }:isShowAddProductButton': '_showButtonAddManual'
             }
         },
 
@@ -65,7 +66,7 @@ define([
                 this.productsModal.notification();
             }.bind(this));
             this.variationsComponent(function (variation) {
-                this._showButtonAddManual(variation.productMatrix());
+                this._showButtonAddManual(variation.attributes());
             }.bind(this));
 
             this._initGrid = _.once(this._initGrid);
@@ -193,12 +194,12 @@ define([
 
         /**
          * Show button add manual
-         * @param {Array} variations
+         * @param {Array} attributes
          * @returns {*}
          * @private
          */
-        _showButtonAddManual: function (variations) {
-            return this.button(variations.length);
+        _showButtonAddManual: function (attributes) {
+            return this.button(attributes.length);
         },
 
         _switchProductType: function (variations) {

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js

@@ -34,6 +34,7 @@ define([
             configurationsSerialized: ko.observable(''),
             variations: [],
             productAttributes: [],
+            isShowAddProductButton: false,
             fullAttributes: [],
             rowIndexToEdit: false,
             productAttributesMap: null,
@@ -73,7 +74,7 @@ define([
                     pageSize: ko.getObservable(this.paging, 'pageSize')
                 };
 
-            this._super().observe('actions opened attributes productMatrix');
+            this._super().observe('actions opened attributes productMatrix isShowAddProductButton');
             this.paging.totalRecords = this.variations.length;
 
             _.each(pagingObservables, function (observable) {
@@ -447,6 +448,7 @@ define([
             }, this);
             this.productMatrix([]);
             this.productMatrix(tempMatrix);
+            this.isShowAddProductButton(this.attributes());
         },
 
         /**

app/code/Magento/Eav/Model/AttributeRepository.php

@@ -103,7 +103,7 @@ public function getList($entityTypeCode, \Magento\Framework\Api\SearchCriteriaIn
             'main_table.entity_type_id = entity_type.entity_type_id',
             []
         );
-        $attributeCollection->join(
+        $attributeCollection->getSelect()->joinLeft(
             ['eav_entity_attribute' => $attributeCollection->getTable('eav_entity_attribute')],
             'main_table.attribute_id = eav_entity_attribute.attribute_id',
             []