MAGETWO-70540: Edit bundle product from shopping cart work unexpected

Author: nmalevanec

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

@@ -142,7 +142,7 @@ public function getDefaultValues()
      */
     protected function _getSelectedOptions()
     {
-        if (is_null($this->_selectedOptions)) {
+        if ($this->_selectedOptions === null) {
             $this->_selectedOptions = [];
 
             /** @var \Magento\Bundle\Model\Option $option */
@@ -152,17 +152,29 @@ protected function _getSelectedOptions()
                 $selectionId = $this->getProduct()->getPreconfiguredValues()->getData(
                     'bundle_option/' . $option->getId()
                 );
-                if ($selectionId && $option->getSelectionById($selectionId)) {
-                    $this->_selectedOptions = $selectionId;
-                } elseif (!$option->getRequired()) {
-                    $this->_selectedOptions = 'None';
-                }
+                $this->assignSelection($option, $selectionId);
             }
         }
 
         return $this->_selectedOptions;
     }
 
+    /**
+     * Set selected options.
+     *
+     * @param \Magento\Bundle\Model\Option $option
+     * @param mixed $selectionId
+     * @return void
+     */
+    protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
+    {
+        if ($selectionId && $option->getSelectionById($selectionId)) {
+            $this->_selectedOptions = $selectionId;
+        } elseif (!$option->getRequired()) {
+            $this->_selectedOptions = 'None';
+        }
+    }
+
     /**
      * Define if selection is selected
      *

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php

@@ -21,24 +21,16 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @inheritdoc
      */
-    protected function _getSelectedOptions()
+    protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
     {
-        if ($this->_selectedOptions === null) {
-            $this->_selectedOptions = [];
-            /** @var \Magento\Bundle\Model\Option $option */
-            $option = $this->getOption();
-            if ($this->getProduct()->hasPreconfiguredValues()) {
-                $selectionIds = $this->getProduct()->getPreconfiguredValues()->getData(
-                    'bundle_option/' . $option->getId()
-                );
-                foreach ($selectionIds as $selectionId) {
-                    if ($selectionId && $option->getSelectionById($selectionId)) {
-                        $this->_selectedOptions[] = $selectionId;
-                    }
+        if (is_array($selectionId)) {
+            foreach ($selectionId as $id) {
+                if ($id && $option->getSelectionById($id)) {
+                    $this->_selectedOptions[] = $id;
                 }
             }
+        } else {
+            parent::assignSelection($option, $selectionId);
         }
-
-        return $this->_selectedOptions;
     }
 }

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml

@@ -11,8 +11,9 @@
 <?php
 $product = $block->getProduct();
 $helper = $this->helper('Magento\Catalog\Helper\Output');
+$stripSelection = $product->getConfigureMode() ? true : false;
+$options = $block->decorateArray($block->getOptions($stripSelection));
 ?>
-<?php $options = $block->decorateArray($block->getOptions($product->getConfigureMode())); ?>
 <?php if ($product->isSaleable()):?>
     <?php if (count($options)): ?>
 <script type="text/x-magento-init">