MAGETWO-71643: [BUGFIX] Flat Category reindexList of AllChildren if the url_key of t… #10557

 - Merge Pull Request #10557 from experius/magento2:develop-pr
 - Merged commits:
   1. 96be1ce

Author: ishakhsuvarov

CHANGELOG.md

@@ -1,3 +1,38 @@
+2.1.10-dev
+=============
+* GitHub issues:
+    * [#6718](https://github.com/magento/magento2/issues/6718) -- Custom composer modules break Component Manager (fixed in [#9692](https://github.com/magento/magento2/pull/9692))
+    * [#4170](https://github.com/magento/magento2/issues/4170) -- Magento2 Mini Cart Items Issue (fixed in [#10050](https://github.com/magento/magento2/pull/10050))
+    * [#5377](https://github.com/magento/magento2/issues/5377) -- "No items" in minicart in 2.1 (fixed in [#10050](https://github.com/magento/magento2/pull/10050))
+    * [#6999](https://github.com/magento/magento2/issues/6999) -- Performance: getConfigurableAttributes cache is broken (fixed in [#9809](https://github.com/magento/magento2/pull/9809))
+    * [#6882](https://github.com/magento/magento2/issues/6882) -- Minicart empty if FPC disabled in Magneto 2.1.1 (fixed in [#10050](https://github.com/magento/magento2/pull/10050))
+    * [#4731](https://github.com/magento/magento2/issues/4731) -- developer mode throws an exception, but production mode is good (fixed in [#9718](https://github.com/magento/magento2/pull/9718))
+    * [#7827](https://github.com/magento/magento2/issues/7827) -- DOM schema validation error (fixed in [#9718](https://github.com/magento/magento2/pull/9718))
+    * [#3872](https://github.com/magento/magento2/issues/3872) -- Slash as category URL suffix gives 404 error on all category pages (fixed in [#10164](https://github.com/magento/magento2/pull/10164))
+    * [#4660](https://github.com/magento/magento2/issues/4660) -- Multiple URLs causes duplicated content (fixed in [#10164](https://github.com/magento/magento2/pull/10164))
+    * [#4876](https://github.com/magento/magento2/issues/4876) -- Product URL Suffix "/" results in 404 error (fixed in [#10164](https://github.com/magento/magento2/pull/10164))
+    * [#8264](https://github.com/magento/magento2/issues/8264) -- Custom URL Rewrite where the request path ends with a forward slash is not matched (fixed in [#10164](https://github.com/magento/magento2/pull/10164))
+    * [#1980](https://github.com/magento/magento2/issues/1980) -- Product attributes' labels are not translated on product edit page (fixed in [#10184](https://github.com/magento/magento2/pull/10184))
+    * [#6818](https://github.com/magento/magento2/issues/6818) -- PageCache gives error "Uncaught TypeError: element.prop is not a function" when there is an iframe (fixed in [#10218](https://github.com/magento/magento2/pull/10218))
+    * [#6175](https://github.com/magento/magento2/issues/6175) -- Unable to generate unsecure URL if current URL is secure (fixed in [#10188](https://github.com/magento/magento2/pull/10188))
+    * [#5651](https://github.com/magento/magento2/issues/5651) -- Purchase date on admin screen is always *:07:00 (fixed in [#10260](https://github.com/magento/magento2/pull/10260))
+    * [#9619](https://github.com/magento/magento2/issues/9619) -- Impossible to create Text Swatch 0 (Zero) (fixed in [#10282](https://github.com/magento/magento2/pull/10282))
+    * [#10266](https://github.com/magento/magento2/issues/10266) -- Product Attributes - Size 0 (fixed in [#10282](https://github.com/magento/magento2/pull/10282))
+* GitHub pull requests:
+    * [#9692](https://github.com/magento/magento2/pull/9692) -- Backport of MAGETWO-59256 for 2.1: Custom composer modules break Component Manager #6718 (by @JTimNolan)
+    * [#9809](https://github.com/magento/magento2/pull/9809) -- Fix issue #6999: Configurable attribute cache was never hit (by @thlassche)
+    * [#10050](https://github.com/magento/magento2/pull/10050) -- [2.1-backport] Customer-data is not updates after login when full page cache disabled (by @ihor-sviziev)
+    * [#10075](https://github.com/magento/magento2/pull/10075) -- Fix date format in adminhtml order grid (by @alessandroniciforo)
+    * [#9718](https://github.com/magento/magento2/pull/9718) -- ported fix from 237e54d - MAGETWO-55684: Fix XSD schema (by @pixelhed)
+    * [#10159](https://github.com/magento/magento2/pull/10159) -- Fix labels tranlation on category page (by @fernandofauth)
+    * [#10164](https://github.com/magento/magento2/pull/10164) -- [2.1-backport] Fix trailing slash used in url rewrites (by @ihor-sviziev)
+    * [#10184](https://github.com/magento/magento2/pull/10184) -- Fixed: Product attributes labels are not translated on product edit page (by @fernandofauth)
+    * [#10211](https://github.com/magento/magento2/pull/10211) -- Add clarification about deprecated methods in Abstract model (by @ihor-sviziev)
+    * [#10218](https://github.com/magento/magento2/pull/10218) -- Backport 1b55a64 to 2.1 - Fixes #6818 (by @ajpevers)
+    * [#10188](https://github.com/magento/magento2/pull/10188) -- magento/magento2:#6175 Fixed Unable to generate unsecure URL if current URL is secure (by @arshadpkm)
+    * [#10260](https://github.com/magento/magento2/pull/10260) -- Fix order date format in Orders Grid (by @ihor-sviziev)
+    * [#10282](https://github.com/magento/magento2/pull/10282) -- 2.1 - Allow to use text swatch 0 (by @ihor-sviziev)
+
 2.1.1
 =============
 To get detailed information about changes in Magento 2.1.1, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.1CE.html "Magento Community Edition (CE) Release Notes")

CONTRIBUTING.md

@@ -29,3 +29,8 @@ If you are a new GitHub user, we recommend that you create your own [free github
 3. Create and test your work.
 4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
+
+## Code of Conduct
+
+Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
+The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).

app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml

@@ -43,7 +43,7 @@
                     <item name="componentType" xsi:type="string">dynamicRows</item>
                     <item name="recordTemplate" xsi:type="string">record</item>
                     <item name="deleteButtonLabel" xsi:type="string">Remove</item>
-                    <item name="addButtonLabel" xsi:type="string">Add New User Agent Rule</item>
+                    <item name="addButtonLabel" xsi:type="string" translate="true">Add New User Agent Rule</item>
                     <item name="deleteProperty" xsi:type="boolean">false</item>
                     <item name="dndConfig" xsi:type="array">
                         <item name="enabled" xsi:type="boolean">false</item>
@@ -67,7 +67,7 @@
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="dataScope" xsi:type="string">search</item>
                             <item name="fit" xsi:type="boolean">false</item>
-                            <item name="label" xsi:type="string">Search String</item>
+                            <item name="label" xsi:type="string" translate="true">Search String</item>
                             <item name="showFallbackReset" xsi:type="boolean">false</item>
                         </item>
                     </argument>
@@ -80,7 +80,7 @@
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="dataScope" xsi:type="string">value</item>
                             <item name="fit" xsi:type="boolean">false</item>
-                            <item name="label" xsi:type="string">Theme Name</item>
+                            <item name="label" xsi:type="string" translate="true">Theme Name</item>
                             <item name="showFallbackReset" xsi:type="boolean">false</item>
                         </item>
                     </argument>
@@ -91,7 +91,7 @@
                             <item name="componentType" xsi:type="string">actionDelete</item>
                             <item name="dataType" xsi:type="string">text</item>
                             <item name="fit" xsi:type="boolean">false</item>
-                            <item name="label" xsi:type="string">Actions</item>
+                            <item name="label" xsi:type="string" translate="true">Actions</item>
                             <item name="sortOrder" xsi:type="string">50</item>
                             <item name="additionalClasses" xsi:type="string">data-grid-actions-cell</item>
                             <item name="template" xsi:type="string">Magento_Backend/dynamic-rows/cells/action-delete</item>

app/code/Magento/Catalog/Model/Category.php

@@ -1090,6 +1090,9 @@ public function reindex()
             $flatIndexer = $this->indexerRegistry->get(Indexer\Category\Flat\State::INDEXER_ID);
             if (!$flatIndexer->isScheduled()) {
                 $flatIndexer->reindexRow($this->getId());
+                if ($this->dataHasChangedFor('url_key')) {
+                    $flatIndexer->reindexList(explode(',', $this->getAllChildren()));
+                }
             }
         }
         $productIndexer = $this->indexerRegistry->get(Indexer\Category\Product::INDEXER_ID);

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -244,7 +244,7 @@ public function modifyMeta(array $meta)
             if ($attributes) {
                 $meta[$groupCode]['children'] = $this->getAttributesMeta($attributes, $groupCode);
                 $meta[$groupCode]['arguments']['data']['config']['componentType'] = Fieldset::NAME;
-                $meta[$groupCode]['arguments']['data']['config']['label'] = __('%1', $group->getAttributeGroupName());
+                $meta[$groupCode]['arguments']['data']['config']['label'] = __('%1', __($group->getAttributeGroupName()));
                 $meta[$groupCode]['arguments']['data']['config']['collapsible'] = true;
                 $meta[$groupCode]['arguments']['data']['config']['dataScope'] = self::DATA_SCOPE_PRODUCT;
                 $meta[$groupCode]['arguments']['data']['config']['sortOrder'] =
@@ -546,7 +546,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
             'required' => $attribute->getIsRequired(),
             'notice' => $attribute->getNote(),
             'default' => $attribute->getDefaultValue(),
-            'label' => $attribute->getDefaultFrontendLabel(),
+            'label' => __($attribute->getDefaultFrontendLabel()),
             'code' => $attribute->getAttributeCode(),
             'source' => $groupCode,
             'scopeLabel' => $this->getScopeLabel($attribute),
@@ -650,7 +650,7 @@ public function setupAttributeContainerMeta(ProductAttributeInterface $attribute
                 'formElement' => 'container',
                 'componentType' => 'container',
                 'breakLine' => false,
-                'label' => $attribute->getDefaultFrontendLabel(),
+                'label' => __($attribute->getDefaultFrontendLabel()),
                 'required' => $attribute->getIsRequired(),
             ]
         );

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

@@ -167,6 +167,7 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="class" xsi:type="string">Magento\Catalog\Ui\Component\Category\Form\Element\Wysiwyg</item>
+                    <item name="label" xsi:type="string" translate="true">Description</item>
                     <item name="formElement" xsi:type="string">wysiwyg</item>
                     <item name="wysiwygConfigData" xsi:type="array">
                         <item name="settings" xsi:type="array">
@@ -217,6 +218,7 @@
                     <item name="sortOrder" xsi:type="number">70</item>
                     <item name="dataType" xsi:type="string">string</item>
                     <item name="formElement" xsi:type="string">select</item>
+                    <item name="label" xsi:type="string" translate="true">Display Mode</item>
                 </item>
             </argument>
         </field>
@@ -253,6 +255,7 @@
                         <item name="additionalClasses" xsi:type="string">admin__field-default</item>
                         <item name="formElement" xsi:type="string">multiselect</item>
                         <item name="source" xsi:type="string">category</item>
+                        <item name="label" xsi:type="string" translate="true">Available Product Listing Sort By</item>
                     </item>
                 </argument>
             </field>
@@ -290,6 +293,7 @@
                         <item name="additionalClasses" xsi:type="string">admin__field-default</item>
                         <item name="formElement" xsi:type="string">select</item>
                         <item name="source" xsi:type="string">category</item>
+                        <item name="label" xsi:type="string" translate="true">Default Product Listing Sort By</item>
                     </item>
                 </argument>
             </field>
@@ -325,6 +329,7 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="additionalClasses" xsi:type="string">admin__field-small</item>
+                        <item name="label" xsi:type="string" translate="true">Layered Navigation Price Step</item>
                         <item name="formElement" xsi:type="string">input</item>
                         <item name="source" xsi:type="string">category</item>
                         <item name="addbefore" xsi:type="string">$</item>

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

@@ -34,7 +34,17 @@
                 <item name="sticky" xsi:type="boolean">true</item>
             </item>
         </argument>
-        <bookmark name="bookmarks"/>
+        <container name="bookmarks">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/controls/bookmarks/bookmarks</item>
+                    <item name="displayArea" xsi:type="string">dataGridActions</item>
+                    <item name="storageConfig" xsi:type="array">
+                        <item name="provider" xsi:type="string">localStorage</item>
+                    </item>
+                </item>
+            </argument>
+        </container>
         <columnsControls name="columns_controls"/>
         <filters name="listing_filters">
             <filterSelect name="store_id">

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

@@ -213,7 +213,7 @@ private function prepareMeta()
                 'dataScope' => 'qty',
                 'validation' => [
                     'validate-number' => true,
-                    'validate-digits' => true,
+                    'validate-integer' => true,
                     'less-than-equals-to' => StockDataFilter::MAX_QTY_VALUE,
                 ],
                 'imports' => [

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

@@ -95,7 +95,7 @@
                         <item name="dataScope" xsi:type="string">quantity_and_stock_status.qty</item>
                         <item name="validation" xsi:type="array">
                             <item name="validate-number" xsi:type="boolean">true</item>
-                            <item name="validate-digits" xsi:type="boolean">true</item>
+                            <item name="validate-integer" xsi:type="boolean">true</item>
                             <item name="less-than-equals-to" xsi:type="number">99999999</item>
                         </item>
                         <item name="sortOrder" xsi:type="number">200</item>

app/code/Magento/CatalogInventory/view/adminhtml/web/js/components/qty-validator-changer.js

@@ -19,8 +19,7 @@ define([
         handleChanges: function (value) {
             var isDigits = value !== 1;
 
-            this.validation['validate-number'] = !isDigits;
-            this.validation['validate-digits'] = isDigits;
+            this.validation['validate-integer'] = isDigits;
             this.validation['less-than-equals-to'] = isDigits ? 99999999 : 99999999.9999;
             this.validate();
         }