MAGETWO-57812: [BACKPORT 2.1.2] It is possible to delete self admin account or role

Yaroslav Onischenko · Yaroslav Onischenko · commit 3f3f02c51c93 · 2016-09-05T14:28:50.000+03:00
diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -8,8 +8,6 @@
 
 /**
  * Store switcher block
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Switcher extends \Magento\Backend\Block\Template
 {
@@ -152,11 +150,7 @@ public function getWebsites()
     {
         $websites = $this->_storeManager->getWebsites();
         if ($websiteIds = $this->getWebsiteIds()) {
-            foreach (array_keys($websites) as $websiteId) {
-                if (!in_array($websiteId, $websiteIds)) {
-                    unset($websites[$websiteId]);
-                }
-            }
+            $websites = array_intersect_key($websites, array_flip($websiteIds));
         }
         return $websites;
     }
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php b/app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Unit\Block\Store;
+
+class SwitcherTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Backend\Block\Store\Switcher
+     */
+    private $switcherBlock;
+
+    private $storeManagerMock;
+
+    protected function setUp()
+    {
+        $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $context = $objectHelper->getObject(
+            \Magento\Backend\Block\Template\Context::class,
+            [
+                'storeManager' => $this->storeManagerMock,
+            ]
+        );
+
+        $this->switcherBlock = $objectHelper->getObject(
+            \Magento\Backend\Block\Store\Switcher::class,
+            ['context' => $context]
+        );
+    }
+
+    public function testGetWebsites()
+    {
+        $websiteMock =  $this->getMock(\Magento\Store\Model\Website::class, [], [], '', false);
+        $websites = [0 => $websiteMock, 1 => $websiteMock];
+        $this->storeManagerMock->expects($this->once())->method('getWebsites')->will($this->returnValue($websites));
+        $this->assertEquals($websites, $this->switcherBlock->getWebsites());
+    }
+
+    public function testGetWebsitesIfSetWebsiteIds()
+    {
+        $websiteMock =  $this->getMock(\Magento\Store\Model\Website::class, [], [], '', false);
+        $websites = [0 => $websiteMock, 1 => $websiteMock];
+        $this->storeManagerMock->expects($this->once())->method('getWebsites')->will($this->returnValue($websites));
+
+        $this->switcherBlock->setWebsiteIds([1]);
+        $expected = [1 => $websiteMock];
+        $this->assertEquals($expected, $this->switcherBlock->getWebsites());
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
@@ -179,14 +179,14 @@ private function processRangeNumeric(FilterInterface $filter, $query, $attribute
         $tableSuffix = $attribute->getBackendType() === 'decimal' ? '_decimal' : '';
         $table = $this->resource->getTableName("catalog_product_index_eav{$tableSuffix}");
         $select = $this->connection->select();
-        $linkIdField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+        $entityField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getIdentifierField();
 
         $currentStoreId = $this->scopeResolver->getScope()->getId();
 
         $select->from(['e' => $this->resource->getTableName('catalog_product_entity')], ['entity_id'])
             ->join(
                 ['main_table' => $table],
-                "main_table.{$linkIdField} = e.{$linkIdField}",
+                "main_table.{$entityField} = e.{$entityField}",
                 []
             )
             ->columns([$filter->getField() => 'main_table.value'])
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
@@ -42,7 +42,10 @@
                                 <span><?php /* @escapeNotVerified */ echo __('View Order') ?></span>
                             </a>
                             <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-                                <a href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>" class="action order">
+                                <a href="#" data-post='<?php /* @escapeNotVerified */ echo
+                                $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
+                                    ->getPostData($block->getReorderUrl($_order))
+                                ?>' class="action order">
                                     <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
                                 </a>
                             <?php endif ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
@@ -10,7 +10,10 @@
 <div class="actions">
     <?php  $_order = $block->getOrder() ?>
     <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-        <a class="action reorder" href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>">
+        <a href="#" data-post='<?php /* @escapeNotVerified */ echo
+        $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
+            ->getPostData($block->getReorderUrl($_order))
+        ?>' class="action order">
             <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
         </a>
     <?php endif ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
@@ -46,7 +46,10 @@
                                     <span><?php /* @escapeNotVerified */ echo __('View Order') ?></span>
                                 </a>
                                 <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-                                    <a href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>" class="action order">
+                                    <a href="#" data-post='<?php /* @escapeNotVerified */ echo
+                                    $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
+                                        ->getPostData($block->getReorderUrl($_order))
+                                    ?>' class="action order">
                                         <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
                                     </a>
                                 <?php endif ?>

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@`
`8`	`8`
`9`	`9`	`/**`
`10`	`10`	`* Store switcher block`
`11`		`- *`
`12`		`- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`13`	`11`	`*/`
`14`	`12`	`class Switcher extends \Magento\Backend\Block\Template`
`15`	`13`	`{`
`@@ -152,11 +150,7 @@ public function getWebsites()`
`152`	`150`	`{`
`153`	`151`	`$websites = $this->_storeManager->getWebsites();`
`154`	`152`	`if ($websiteIds = $this->getWebsiteIds()) {`
`155`		`- foreach (array_keys($websites) as $websiteId) {`
`156`		`- if (!in_array($websiteId, $websiteIds)) {`
`157`		`- unset($websites[$websiteId]);`
`158`		`- }`
`159`		`- }`
	`153`	`+ $websites = array_intersect_key($websites, array_flip($websiteIds));`
`160`	`154`	`}`
`161`	`155`	`return $websites;`
`162`	`156`	`}`