Merge branch 'develop' of github.com:magento-folks/magento2ce into bugs_functional_tests

Author: omiroshnichenko

app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php

@@ -59,7 +59,6 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
             $storeModel->setData($postData['store']);
         }
         $fieldset = $form->addFieldset('store_fieldset', ['legend' => __('Store View Information')]);
-
         $storeAction = $this->_coreRegistry->registry('store_action');
         if ($storeAction == 'edit' || $storeAction == 'add') {
             $fieldset->addField(
@@ -76,7 +75,6 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
             );
             $fieldset = $this->prepareGroupIdField($form, $storeModel, $fieldset);
         }
-
         $fieldset->addField(
             'store_name',
             'text',
@@ -99,7 +97,8 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'disabled' => $storeModel->isReadOnly()
             ]
         );
-
+        $isDisabledStatusField = $storeModel->isReadOnly()
+            || ($storeModel->getId() && $storeModel->isDefault() && $storeModel->isActive());
         $fieldset->addField(
             'store_is_active',
             'select',
@@ -109,11 +108,19 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'value' => $storeModel->isActive(),
                 'options' => [0 => __('Disabled'), 1 => __('Enabled')],
                 'required' => true,
-                'disabled' => $storeModel->isReadOnly()
-                    || ($storeModel->getId() && $storeModel->isDefault() && $storeModel->isActive())
+                'disabled' => $isDisabledStatusField
             ]
         );
-
+        if ($isDisabledStatusField) {
+            $fieldset->addField(
+                'store_is_active_hidden',
+                'hidden',
+                [
+                    'name' => 'store[is_active]',
+                    'value' => $storeModel->isActive(),
+                ]
+            );
+        }
         $fieldset->addField(
             'store_sort_order',
             'text',
@@ -125,13 +132,11 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'disabled' => $storeModel->isReadOnly()
             ]
         );
-
         $fieldset->addField(
             'store_is_default',
             'hidden',
             ['name' => 'store[is_default]', 'no_span' => true, 'value' => $storeModel->getIsDefault()]
         );
-
         $fieldset->addField(
             'store_store_id',
             'hidden',

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php

@@ -155,8 +155,8 @@ private function setMessageToResponse($response, $messages)
     private function checkUniqueOption(DataObject $response, array $options = null)
     {
         if (is_array($options)
-            && isset($options['value'])
-            && isset($options['delete'])
+            && !empty($options['value'])
+            && !empty($options['delete'])
             && !$this->isUniqueAdminValues($options['value'], $options['delete'])
         ) {
             $this->setMessageToResponse($response, [__("The value of Admin must be unique.")]);

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php

@@ -198,8 +198,16 @@ public function testUniqueValidation(array $options, $isError)
     public function provideUniqueData()
     {
         return [
-            // valid options
-            [
+            'no values' => [
+                [
+                    'delete' => [
+                        "option_0" => "",
+                        "option_1" => "",
+                        "option_2" => "",
+                    ]
+                ], false
+            ],
+            'valid options' => [
                 [
                     'value' => [
                         "option_0" => [1, 0],
@@ -213,8 +221,7 @@ public function provideUniqueData()
                     ]
                 ], false
             ],
-            //with duplicate
-            [
+            'duplicate options' => [
                 [
                     'value' => [
                         "option_0" => [1, 0],
@@ -228,8 +235,7 @@ public function provideUniqueData()
                     ]
                 ], true
             ],
-            //with duplicate but deleted
-            [
+            'duplicate and deleted' => [
                 [
                     'value' => [
                         "option_0" => [1, 0],

app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

@@ -424,7 +424,7 @@
         </settings>
         <container name="assign_products_container" sortOrder="160">
             <htmlContent name="html_content">
-                <argument name="block" xsi:type="object">Magento\Catalog\Block\Adminhtml\Category\AssignProducts</argument>
+                <block name="gallery" class="Magento\Catalog\Block\Adminhtml\Category\AssignProducts"/>
             </htmlContent>
         </container>
     </fieldset>

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -12,7 +12,8 @@
 /**
  * Export entity product model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)

app/code/Magento/CatalogImportExport/Model/Export/Product/Type/AbstractType.php

@@ -10,7 +10,7 @@
 /**
  * Export entity product type abstract model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 abstract class AbstractType
 {

app/code/Magento/CatalogImportExport/Model/Export/Product/Type/Simple.php

@@ -8,7 +8,7 @@
 /**
  * Export entity product type simple model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Simple extends \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType
 {

app/code/Magento/CatalogImportExport/Model/Export/RowCustomizer/Composite.php

@@ -8,6 +8,11 @@
 use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\Framework\ObjectManagerInterface;
 
+/**
+ * Class Composite
+ *
+ * @api
+ */
 class Composite implements RowCustomizerInterface
 {
     /**

app/code/Magento/CatalogImportExport/Model/Export/RowCustomizerInterface.php

@@ -7,6 +7,8 @@
 
 /**
  * Interface RowCustomizerInterface
+ *
+ * @api
  */
 interface RowCustomizerInterface
 {

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -21,6 +21,9 @@
 
 /**
  * Import entity product model
+ *
+ * @api
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)