Merge pull request #273 from magento-goinc/pr-273

Slabko,Michael(mslabko) · Slabko,Michael(mslabko) · commit c58d2dacaf69 · 2015-12-29T19:15:32.000+02:00
[SWAT] Bug fixes
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/bundle-type-handler.js b/app/code/Magento/Bundle/view/adminhtml/web/js/bundle-type-handler.js
@@ -33,7 +33,7 @@ define([
          */
         _initType: function () {
             if (
-                productType.type.real === 'bundle' &&
+                productType.type.init === 'bundle' &&
                 productType.type.current !== 'bundle' &&
                 !weight.isLocked()
             ) {
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/apply-to-type-switcher.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/apply-to-type-switcher.js
@@ -4,9 +4,8 @@
  */
 define([
     'jquery',
-    'Magento_Catalog/js/product/weight-handler',
     'Magento_Catalog/catalog/type-events'
-], function ($, weight, productType) {
+], function ($, productType) {
     'use strict';
 
     return {
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js
@@ -3,9 +3,8 @@
  * See COPYING.txt for license details.
  */
 define([
-    'jquery',
-    'Magento_Catalog/js/product/weight-handler'
-], function ($, weight) {
+    'jquery'
+], function ($) {
     'use strict';
 
     return {
@@ -15,20 +14,10 @@ define([
          * Init
          */
         init: function () {
-
-            //not weight switcher for specific product
-            if (weight.productHasWeightBySwitcher() && weight.hasWeightSwither()) {
-                this.type = {
-                    virtual: 'virtual',
-                    real: this.$type.val() //simple, configurable
-                };
-            } else {
-                this.type = {
-                    virtual: this.$type.val(), //downloadable, virtual, grouped, bundle
-                    real: 'simple'
-                };
-            }
-            this.type.current = this.$type.val();
+            this.type = {
+                init: this.$type.val(),
+                current: this.$type.val()
+            };
 
             this.bindAll();
         },
@@ -54,7 +43,7 @@ define([
          * @returns {*}
          */
         setType: function (type) {
-            return this.$type.val(type || this.type.real).trigger('change');
+            return this.$type.val(type || this.type.init).trigger('change');
         },
 
         /**
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js
@@ -71,6 +71,14 @@ define([
             return this.$weightSwitcher().is(':visible');
         },
 
+        /**
+         * Has weight
+         * @returns {*}
+         */
+        hasWeight: function () {
+            return this.$weight.is(':visible');
+        },
+
         /**
          * Product has weight
          * @returns {Bool}
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/di.xml b/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/di.xml
@@ -16,9 +16,6 @@
         <plugin name="category_move_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Move"/>
         <plugin name="category_delete_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Remove"/>
     </type>
-    <type name="Magento\UrlRewrite\Model\StorageInterface">
-        <plugin name="storage_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Storage"/>
-    </type>
     <type name="Magento\Catalog\Block\Adminhtml\Category\Tab\Attributes">
         <plugin name="category_form_url_key_plugin" type="Magento\CatalogUrlRewrite\Plugin\Catalog\Block\Adminhtml\Category\Tab\Attributes"/>
     </type>
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/di.xml b/app/code/Magento/CatalogUrlRewrite/etc/di.xml
@@ -20,4 +20,7 @@
         <plugin name="category_move_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Move"/>
         <plugin name="category_delete_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Remove"/>
     </type>
+    <type name="Magento\UrlRewrite\Model\StorageInterface">
+        <plugin name="storage_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Storage"/>
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
@@ -27,17 +27,25 @@ class Config extends Widget implements TabInterface
      */
     protected $_coreRegistry;
 
+    /**
+     * @var Configurable
+     */
+    protected $configurableType;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
+     * @param Configurable $configurableType
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $coreRegistry,
+        Configurable $configurableType,
         array $data = []
     ) {
         $this->_coreRegistry = $coreRegistry;
+        $this->configurableType = $configurableType;
         parent::__construct($context, $data);
     }
 
@@ -129,17 +137,18 @@ public function getParentTab()
     /**
      * @return bool
      */
-    public function isConfigurableProduct()
+    public function isHasVariations()
     {
-        return $this->getProduct()->getTypeId() === Configurable::TYPE_CODE || $this->getRequest()->has('attributes');
+        return $this->getProduct()->getTypeId() === Configurable::TYPE_CODE
+            && $this->configurableType->getUsedProducts($this->getProduct());
     }
 
     /**
      * @return $this
      */
     protected function _prepareLayout()
     {
-        $this->setData('opened', $this->isConfigurableProduct());
+        $this->setData('opened', $this->getProduct()->getTypeId() === Configurable::TYPE_CODE);
         return parent::_prepareLayout();
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -21,7 +21,7 @@
                 <button type="button" data-action="open-steps-wizard" title="Create Product Configurations"
                         class="action-secondary" data-bind="click: open">
                 <span data-role="button-label" data-edit-label="<?= /* @escapeNotVerified */  __('Edit Configurations') ?>">
-                    <?= /* @escapeNotVerified */  $block->getProduct()->getId() && $block->isConfigurableProduct()
+                    <?= /* @escapeNotVerified */  $block->isHasVariations()
                         ? __('Edit Configurations')
                         : __('Create Configurations')
                     ?>
@@ -74,7 +74,7 @@
             "Magento_ConfigurableProduct/js/configurable-type-handler": {
                 "blockId": "#<?= /* @noEscape */ $block->getId()?>",
                 "tabId": "<?= /* @noEscape */ $block->getTabId()?>",
-                "hasVariations": "<?= /* @noEscape */ $block->isConfigurableProduct() ? 'true' : 'false' ?>"
+                "hasVariations": <?= /* @noEscape */ $block->isHasVariations() ? 'true' : 'false' ?>
             }
         }
     }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/configurable-type-handler.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/configurable-type-handler.js
@@ -71,7 +71,10 @@ define([
          */
         bindAll: function () {
             $(document).on('changeConfigurableTypeProduct', function (event, isConfigurable) {
-                $(document).trigger('setTypeProduct', isConfigurable ? 'configurable' : null);
+                $(document).trigger('setTypeProduct', isConfigurable ?
+                    'configurable' :
+                    productType.type.init === 'configurable' ? 'simple' : productType.type.init
+                );
             });
             $(document).on('changeTypeProduct', this._initType.bind(this));
         },
@@ -84,16 +87,15 @@ define([
             var suggestContainer = $('#product-template-suggest-container .action-dropdown > .action-toggle');
 
             if (productType.type.current === 'configurable') {
-                suggestContainer.addClass('disabled').prop('disabled', true);
-                $('#inventory_qty').prop('disabled', true);
-                $('#inventory_stock_availability').removeProp('disabled');
+                this._setElementDisabled(suggestContainer.addClass('disabled'), true);
+                this._setElementDisabled($('#inventory_qty'), true);
+                this._setElementDisabled($('#inventory_stock_availability'), false);
                 this._setElementDisabled($('#qty'), true, true);
                 this._setElementDisabled($('#quantity_and_stock_status'), false, false);
             } else {
-                suggestContainer.removeClass('disabled').removeProp('disabled');
-                $('#inventory_qty').removeProp('disabled');
-                $('#inventory_stock_availability').prop('disabled', true);
-                this._setElementDisabled($('#quantity_and_stock_status'), true, false);
+                this._setElementDisabled(suggestContainer.removeClass('disabled'), false);
+                this._setElementDisabled($('#inventory_qty'), false);
+                this._setElementDisabled($('#inventory_stock_availability'), true);
                 this._setElementDisabled($('#qty'), false, true);
             }
 
@@ -115,6 +117,10 @@ define([
             advancedPricingHandler.init();
             priceTypeHandler.init();
 
+            if (productType.type.init === 'configurable' && !this.hasVariations) {
+                $(document).trigger('setTypeProduct', 'simple');
+            }
+
             this.bindAll();
             this._initType();
         }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.js
@@ -135,7 +135,9 @@ define([
             };
         },
         getProductValue: function (name) {
-            return $('[name="product[' + name.split('/').join('][') + ']"]', this.productForm).val();
+            name = name.split('/').join('][');
+
+            return $('[name="product[' + name + ']"]:enabled:not(.ignore-validate)', this.productForm).val();
         },
         getRowId: function (data, field) {
             var key = data.variationKey;
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -208,7 +208,7 @@ require([
                 '</select>'+
             '</td>'+
             '<td class="col-limit">' +
-                '<input type="text" id="downloadable_link_<%- data.id %>_downloads" name="downloadable[link][<%- data.id %>][number_of_downloads]" class="input-text admin__control-text downloads" value="<%- data.number_of_downloads %>" />'+
+                '<input type="text" id="downloadable_link_<%- data.id %>_downloads" name="downloadable[link][<%- data.id %>][number_of_downloads]" class="input-text validate-zero-or-greater admin__control-text downloads" value="<%- data.number_of_downloads %>" />'+
                 '<div class="admin__field admin__field-option">' +
                     '<input type="checkbox" class="admin__control-checkbox" id="downloadable_link_<%- data.id %>_is_unlimited" name="downloadable[link][<%- data.id %>][is_unlimited]" value="1" <%- data.is_unlimited %> />' +
                     '<label for="downloadable_link_<%- data.id %>_is_unlimited" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Unlimited'); ?></span></label>' +
@@ -470,9 +470,7 @@ require([
         };
 
         if (jQuery('input[name="product[links_purchased_separately]"]')) {
-            jQuery('input[name="product[links_purchased_separately]"]').on('change', function () {
-                linkItems.togglePriceFields.bind()
-            });
+            jQuery('input[name="product[links_purchased_separately]"]').on('change', linkItems.togglePriceFields.bind());
         }
 
         if($('add_link_item')) {
diff --git a/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js b/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js
@@ -48,7 +48,10 @@ define([
          */
         bindAll: function () {
             this.$checkbox.on('change', function (event) {
-                $(document).trigger('setTypeProduct', $(event.target).prop('checked') ? 'downloadable' : null);
+                $(document).trigger('setTypeProduct', $(event.target).prop('checked') ?
+                    'downloadable' :
+                    productType.type.init === 'downloadable' ? 'virtual' : productType.type.init
+                );
             });
 
             $(document).on('changeTypeProduct', this._initType.bind(this));
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
@@ -355,8 +355,10 @@ define([
                 data: 'remote_image=' + sourceUrl,
                 type: 'post',
                 success: $.proxy(function (result) {
-                    this._tempPreviewImageData = result;
-                    this._getPreviewImage().attr('src', sourceUrl).show();
+                    if (!this._isEditPage) {
+                        this._tempPreviewImageData = result;
+                        this._getPreviewImage().attr('src', sourceUrl).show();
+                    }
                     this._blockActionButtons(false, true);
                 }, self)
             });
@@ -1001,6 +1003,7 @@ define([
         _onClose: function () {
             var newVideoForm;
 
+            this._isEditPage = true;
             this.imageData = null;
 
             if (this._previewImage) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/CategoryForm.xml
@@ -19,6 +19,10 @@
             <include_in_menu>
                 <input>select</input>
             </include_in_menu>
+            <use_default_name>
+                <selector>[name="use_default[]"][value="name"]</selector>
+                <input>checkbox</input>
+            </use_default_name>
         </fields>
     </general_information>
     <display_setting>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category.xml
@@ -34,6 +34,7 @@
         <field name="meta_description" is_required="" group="general_information" />
         <field name="id" group="null" />
         <field name="name" group="general_information" />
+        <field name="use_default_name" group="general_information"/>
         <field name="is_active" group="general_information" />
         <field name="is_anchor" group="display_setting" />
         <field name="url_key" group="general_information" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
@@ -48,6 +48,7 @@
         </variation>
         <variation name="UpdateCategoryEntityTestVariation4" summary="Update Category with custom Store View.">
             <data name="category/data/store_id/dataset" xsi:type="string">custom</data>
+	    <data name="category/data/use_default_name" xsi:type="string">No</data>
             <data name="category/data/name" xsi:type="string">Category %isolation%</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryWithCustomStoreOnFrontend" />

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`<button type="button" data-action="open-steps-wizard" title="Create Product Configurations"`
`22`	`22`	`class="action-secondary" data-bind="click: open">`
`23`	`23`	`<span data-role="button-label" data-edit-label="<?= /* @escapeNotVerified */ __('Edit Configurations') ?>">`
`24`		`- <?= /* @escapeNotVerified */ $block->getProduct()->getId() && $block->isConfigurableProduct()`
	`24`	`+ <?= /* @escapeNotVerified */ $block->isHasVariations()`
`25`	`25`	`? __('Edit Configurations')`
`26`	`26`	`: __('Create Configurations')`
`27`	`27`	`?>`
`@@ -74,7 +74,7 @@`
`74`	`74`	`"Magento_ConfigurableProduct/js/configurable-type-handler": {`
`75`	`75`	`"blockId": "#<?= /* @noEscape */ $block->getId()?>",`
`76`	`76`	`"tabId": "<?= /* @noEscape */ $block->getTabId()?>",`
`77`		`- "hasVariations": "<?= /* @noEscape */ $block->isConfigurableProduct() ? 'true' : 'false' ?>"`
	`77`	`+ "hasVariations": <?= /* @noEscape */ $block->isHasVariations() ? 'true' : 'false' ?>`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`}`