Merge remote-tracking branch 'nord/MAGETWO-50761' into pr-495

Author: mslabko

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

@@ -77,14 +77,15 @@
     <?php
     $values = [];
     foreach($block->getOptionValues() as $value) {
-        array_push($values, $value->getData());
+        $value = $value->getData();
+        $values[] = is_array($value) ? array_map("htmlspecialchars_decode", $value) : $value;
     }
     ?>
     <script type="text/x-magento-init">
         {
             "*": {
                 "Magento_Catalog/js/options": {
-                    "attributesData": <?php /* @escapeNotVerified */ echo json_encode($values); ?>,
+                    "attributesData": <?php /* @noEscape */ echo json_encode($values, JSON_HEX_QUOT); ?>,
                     "isSortable":  <?php echo (int)(!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) ?>,
                     "isReadOnly": <?php echo (int)$block->getReadOnly(); ?>
                 }

app/code/Magento/Catalog/view/base/web/js/price-options.js

@@ -18,7 +18,7 @@ define([
         optionsSelector: '.product-custom-option',
         optionConfig: {},
         optionHandlers: {},
-        optionTemplate: '<%- data.label %>' +
+        optionTemplate: '<%= data.label %>' +
         '<% if (data.finalPrice.value) { %>' +
         ' +<%- data.finalPrice.formatted %>' +
         '<% } %>',

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php

@@ -196,7 +196,7 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
         )->columns(['qty' => new \Zend_Db_Expr('SUM(' . $qtyExpr . ')')])
             ->where('cw.website_id != 0')
             ->where('e.type_id = ?', $this->getTypeId())
-            ->group('e.entity_id');
+            ->group(['e.entity_id', 'cw.website_id']);
 
         // add limitation of status
         $condition = $connection->quoteInto(

dev/tests/integration/testsuite/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStockTest.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock;
+
+/**
+ * Class DefaultStockTest
+ * @magentoAppArea adminhtml
+ */
+class DefaultStockTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock
+     */
+    private $indexer;
+
+    protected function setUp()
+    {
+        $this->indexer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock::class
+        );
+
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/website.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     *
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testReindexEntity()
+    {
+        /** @var \Magento\Catalog\Model\ProductRepository $productRepository */
+        $productRepository = $this->getObject(\Magento\Catalog\Model\ProductRepository::class);
+        /** @var \Magento\Store\Api\WebsiteRepositoryInterface $websiteRepository */
+        $websiteRepository = $this->getObject(
+            \Magento\Store\Api\WebsiteRepositoryInterface::class
+        );
+        $product = $productRepository->get('simple');
+        $testWebsite = $websiteRepository->get('test');
+        $product->setWebsiteIds([1, $testWebsite->getId()])->save();
+
+        /** @var \Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory $criteriaFactory */
+        $criteriaFactory = $this->getObject(
+            \Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory::class
+        );
+        /** @var \Magento\CatalogInventory\Api\StockStatusRepositoryInterface $stockStatusRepository */
+        $stockStatusRepository = $this->getObject(
+            \Magento\CatalogInventory\Api\StockStatusRepositoryInterface::class
+        );
+        $criteria = $criteriaFactory->create();
+        $criteria->setProductsFilter([$product->getId()]);
+        $criteria->addFilter('website', 'website_id', $testWebsite->getId());
+        $items = $stockStatusRepository->getList($criteria)->getItems();
+        $this->assertEquals($product->getId(), $items[$product->getId()]->getProductId());
+    }
+
+    private function getObject($class)
+    {
+        return \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            $class
+        );
+    }
+}