Merge remote-tracking branch 'origin/develop' into develop

Author: Cari Spruiell

app/code/Magento/Backend/Model/Auth.php

@@ -175,7 +175,7 @@ public function login($username, $password)
                 'backend_auth_user_login_failed',
                 ['user_name' => $username, 'exception' => $e]
             );
-            self::throwException(__('Please correct the user name or password.'));
+            self::throwException(__($e->getMessage()? : 'Please correct the user name or password.'));
         }
     }
 

app/code/Magento/Backend/Test/Unit/Model/AuthTest.php

@@ -59,7 +59,8 @@ public function testLoginFailed()
             ->method('create')
             ->with('Magento\Backend\Model\Auth\Credential\StorageInterface')
             ->will($this->returnValue($this->_credentialStorage));
-        $exceptionMock = new \Magento\Framework\Exception\LocalizedException(__('message'));
+        $exceptionMock =
+            new \Magento\Framework\Exception\LocalizedException(__('Please correct the user name or password.'));
         $this->_credentialStorage
             ->expects($this->once())
             ->method('login')

app/code/Magento/Bundle/Api/Data/LinkInterface.php

@@ -7,6 +7,10 @@
 
 namespace Magento\Bundle\Api\Data;
 
+/**
+ * Interface LinkInterface
+ * @api
+ */
 interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     const PRICE_TYPE_FIXED = 0;

app/code/Magento/Bundle/Api/Data/OptionInterface.php

@@ -7,6 +7,10 @@
 
 namespace Magento\Bundle\Api\Data;
 
+/**
+ * Interface OptionInterface
+ * @api
+ */
 interface OptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**

app/code/Magento/Bundle/Api/Data/OptionTypeInterface.php

@@ -6,6 +6,10 @@
  */
 namespace Magento\Bundle\Api\Data;
 
+/**
+ * Interface OptionTypeInterface
+ * @api
+ */
 interface OptionTypeInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**

app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php

@@ -6,6 +6,10 @@
  */
 namespace Magento\Bundle\Api;
 
+/**
+ * Interface for Management of ProductLink
+ * @api
+ */
 interface ProductLinkManagementInterface
 {
     /**

app/code/Magento/Bundle/Api/ProductOptionRepositoryInterface.php

@@ -6,6 +6,10 @@
  */
 namespace Magento\Bundle\Api;
 
+/**
+ * Interface ProductOptionRepositoryInterface
+ * @api
+ */
 interface ProductOptionRepositoryInterface
 {
     /**

app/code/Magento/Bundle/Api/ProductOptionTypeListInterface.php

@@ -6,6 +6,10 @@
  */
 namespace Magento\Bundle\Api;
 
+/**
+ * Interface ProductOptionTypeListInterface
+ * @api
+ */
 interface ProductOptionTypeListInterface
 {
     /**

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php

@@ -110,9 +110,12 @@ public function getOptions()
      */
     public function isDisabledField()
     {
-        return $this->getProduct()->getId() &&
-            $this->getAttribute()->getAttributeCode() === 'price' ||
-            $this->getElement()->getReadonly();
+        return $this->_getData('is_disabled_field')
+            || ($this->getProduct()->getId()
+                && $this->getAttribute()->getAttributeCode() === 'price'
+            )
+            || $this->getElement()->getReadonly();
+
     }
 
     /**
@@ -142,7 +145,9 @@ public function getExtendedElement($switchAttributeCode)
                 'values' => $this->getOptions(),
                 'value' => $switchAttributeCode,
                 'class' => 'required-entry next-toinput',
-                'disabled' => $this->isDisabledField()
+                'no_span' => true,
+                'disabled' => $this->isDisabledField(),
+                'value' => $this->getProduct()->getData($switchAttributeCode),
             ]
         );
     }

app/code/Magento/Bundle/Pricing/Price/BundleOptionPriceInterface.php

@@ -7,6 +7,7 @@
 
 /**
  * Option price interface
+ * @api
  */
 interface BundleOptionPriceInterface
 {