Merge pull request #231 from magento-south/BUGS

[South] Sprint #34 Bug fixes
magento · Apr 15, 2015 · d4f4da9 · d4f4da9
2 parents 07f9f16 + d363ea2
commit d4f4da9
Show file tree

Hide file tree

Showing 31 changed files with 774 additions and 71 deletions.
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php
@@ -46,7 +46,7 @@ public function getValuesHtml()
             if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DROP_DOWN) {
                 $select->setName('options[' . $_option->getid() . ']')->addOption('', __('-- Please Select --'));
             } else {
-                $select->setName('options[' . $_option->getid() . '][]');
+                $select->setName('options[' . $_option->getid() . ']');
                 $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
             }
             foreach ($_option->getValues() as $_value) {
@@ -141,7 +141,7 @@ public function getValuesHtml()
                     ' name="options[' .
                     $_option->getId() .
                     ']' .
-                    $arraySign .
+                    (!empty($arraySign) ? '[' . $htmlValue . ']' : '') .
                     '" id="options_' .
                     $_option->getId() .
                     '_' .

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -195,7 +195,7 @@ ProductConfigure.prototype = {
             return false;
         }
 
-        this._initWindowElements();
+        this.initialize();
         this.current.listType = listType;
         this.current.itemId = itemId;
         this.confirmedCurrentId = this._getConfirmedBlockId(listType, itemId);

diff --git a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * CMS block CRUD interface.
+ * @api
  */
 interface BlockRepositoryInterface
 {

diff --git a/app/code/Magento/Cms/Api/Data/BlockInterface.php b/app/code/Magento/Cms/Api/Data/BlockInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * CMS block interface.
+ * @api
  */
 interface BlockInterface
 {

diff --git a/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php b/app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface for cms block search results.
+ * @api
  */
 interface BlockSearchResultsInterface extends SearchResultsInterface
 {

diff --git a/app/code/Magento/Cms/Api/Data/PageInterface.php b/app/code/Magento/Cms/Api/Data/PageInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * CMS page interface.
+ * @api
  */
 interface PageInterface
 {

diff --git a/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php b/app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * Interface for cms page search results.
+ * @api
  */
 interface PageSearchResultsInterface extends SearchResultsInterface
 {

diff --git a/app/code/Magento/Cms/Api/PageRepositoryInterface.php b/app/code/Magento/Cms/Api/PageRepositoryInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * CMS page CRUD interface.
+ * @api
  */
 interface PageRepositoryInterface
 {

diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -420,10 +420,12 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
                         )
                     );
             }
+            return true;
         } catch (MailException $e) {
             // If we are not able to send a reset password email, this should be ignored
             $this->logger->critical($e);
         }
+        return false;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     /**
      * CMS block CRUD interface.
+     * @api
      */
     interface BlockRepositoryInterface
     {
@@ Expand Down @@