Merge remote-tracking branch 'origin/MAGETWO-90301' into MAGETWO-90301

# Conflicts:
#	dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/CheckCheckoutSuccessPageTest.xml

Author: 1408sheva

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -19,20 +19,12 @@
     </ul>
 </div>
 
-<script>
-require([
-    "jquery",
-    "Magento_Ui/js/modal/modal"
-], function($){
-    if (this.modal) {
-        this.modal.html($('[data-role="system_messages_list"]').html());
-    } else {
-        this.modal = $('[data-role="system_messages_list"]').modal({
-            modalClass: 'modal-system-messages ui-popup-message',
-            type: 'popup',
-            buttons: []
-        });
+<script type="text/x-magento-init">
+    {
+        "[data-role=system_messages_list]": {
+            "Magento_AdminNotification/js/system/messages/popup": {
+                class: 'modal-system-messages ui-popup-message'
+            }
+        }
     }
-    this.modal.modal('openModal');
-});
-</script>
+</script>

app/code/Magento/AdminNotification/view/adminhtml/web/js/system/messages/popup.js

@@ -0,0 +1,24 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+*/
+
+define([
+    'jquery',
+    'Magento_Ui/js/modal/modal'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+        if (this.modal) {
+            this.modal.html($(element).html());
+        } else {
+            this.modal = $(element).modal({
+                modalClass: data.class,
+                type: 'popup',
+                buttons: []
+            });
+        }
+        this.modal.modal('openModal');
+    };
+});

app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStorePost.php

@@ -37,8 +37,6 @@ public function execute()
         try {
             $model->delete();
 
-            $this->_eventManager->dispatch('store_delete', ['store' => $model]);
-
             $this->messageManager->addSuccess(__('You deleted the store view.'));
             return $redirectResult->setPath('adminhtml/*/');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {

app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php

@@ -46,7 +46,6 @@ private function processWebsiteSave($postData)
      */
     private function processStoreSave($postData)
     {
-        $eventName = 'store_edit';
         /** @var \Magento\Store\Model\Store $storeModel */
         $storeModel = $this->_objectManager->create(\Magento\Store\Model\Store::class);
         $postData['store']['name'] = $this->filterManager->removeTags($postData['store']['name']);
@@ -56,7 +55,6 @@ private function processStoreSave($postData)
         $storeModel->setData($postData['store']);
         if ($postData['store']['store_id'] == '') {
             $storeModel->setId(null);
-            $eventName = 'store_add';
         }
         $groupModel = $this->_objectManager->create(
             \Magento\Store\Model\Group::class
@@ -70,8 +68,6 @@ private function processStoreSave($postData)
             );
         }
         $storeModel->save();
-        $this->_objectManager->get(\Magento\Store\Model\StoreManager::class)->reinitStores();
-        $this->_eventManager->dispatch($eventName, ['store' => $storeModel]);
         $this->messageManager->addSuccess(__('You saved the store view.'));
 
         return $postData;
@@ -102,7 +98,6 @@ private function processGroupSave($postData)
             );
         }
         $groupModel->save();
-        $this->_eventManager->dispatch('store_group_save', ['group' => $groupModel]);
         $this->messageManager->addSuccess(__('You saved the store.'));
 
         return $postData;

app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php

@@ -196,7 +196,7 @@ public function setCollection($collection)
                 $this->_collection->addAttributeToSort(
                     $this->getCurrentOrder(),
                     $this->getCurrentDirection()
-                )->addAttributeToSort('entity_id', $this->getCurrentDirection());
+                );
             } else {
                 $this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection());
             }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

@@ -216,6 +216,9 @@ private function handleImageRemoveError($postData, $productId)
     /**
      * Do copying data to stores
      *
+     * If the 'copy_from' field is not specified in the input data,
+     * the store fallback mechanism will automatically take the admin store's default value.
+     *
      * @param array $data
      * @param int $productId
      * @return void
@@ -227,15 +230,17 @@ protected function copyToStores($data, $productId)
                 if (isset($data['product']['website_ids'][$websiteId])
                     && (bool)$data['product']['website_ids'][$websiteId]) {
                     foreach ($group as $store) {
-                        $copyFrom = (isset($store['copy_from'])) ? $store['copy_from'] : 0;
-                        $copyTo = (isset($store['copy_to'])) ? $store['copy_to'] : 0;
-                        if ($copyTo) {
-                            $this->_objectManager->create(\Magento\Catalog\Model\Product::class)
-                                ->setStoreId($copyFrom)
-                                ->load($productId)
-                                ->setStoreId($copyTo)
-                                ->setCopyFromView(true)
-                                ->save();
+                        if (isset($store['copy_from'])) {
+                            $copyFrom = $store['copy_from'];
+                            $copyTo = (isset($store['copy_to'])) ? $store['copy_to'] : 0;
+                            if ($copyTo) {
+                                $this->_objectManager->create(\Magento\Catalog\Model\Product::class)
+                                    ->setStoreId($copyFrom)
+                                    ->load($productId)
+                                    ->setStoreId($copyTo)
+                                    ->setCopyFromView(true)
+                                    ->save();
+                            }
                         }
                     }
                 }

app/code/Magento/Catalog/Model/ResourceModel/Attribute.php

@@ -141,19 +141,17 @@ public function deleteEntity(\Magento\Framework\Model\AbstractModel $object)
                     ->getMetadata(ProductInterface::class)
                     ->getLinkField();
 
-                $select = $this->getConnection()->select()->from(
-                    $attribute->getEntity()->getEntityTable(),
-                    $linkField
-                )->where(
-                    'attribute_set_id = ?',
-                    $result['attribute_set_id']
-                );
+                $backendLinkField = $attribute->getBackend()->getEntityIdField();
 
-                $clearCondition = [
-                    'attribute_id =?' => $attribute->getId(),
-                    $linkField . ' IN (?)' => $select,
-                ];
-                $this->getConnection()->delete($backendTable, $clearCondition);
+                $select = $this->getConnection()->select()
+                    ->from(['b' => $backendTable])
+                    ->join(
+                        ['e' => $attribute->getEntity()->getEntityTable()],
+                        "b.$backendLinkField = e.$linkField"
+                    )->where('b.attribute_id = ?', $attribute->getId())
+                    ->where('e.attribute_set_id = ?', $result['attribute_set_id']);
+
+                $this->getConnection()->query($select->deleteFromSelect('b'));
             }
         }