🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #17029: [Backport] Fixes Black color coding standard. (by @chirag-wagento)
 - #17092: [Backport] Remove forced setting of cache_lifetime to false in constructor and set default cache_lifetime to 3600 (by @mageprince)
 - #17111: [Backport] Fixed widget template rendering issue while rewriting widget block (by @gelanivishal)
 - #16809: [Backport] Remove double semicolon from the style sheets. (by @gelanivishal)
 - #17089: [Backport] Fixed comparison with 0 bug for TableRate shipping carrier (by @mageprince)
 - #17088: [Backport] Solved this issue : Drop down values are not showing in catalog produ� (by @mageprince)


Fixed GitHub Issues:
 - #13595: loadCache for Block Magento\Theme\Block\Html\Footer dont work (reported by @larsroettig) has been fixed in #17092 by @mageprince in 2.1-develop branch
   Related commits:
     1. 58698b5

 - #16529: Rewriting product listing widget block breaks its template rendering. (reported by @sanganinamrata) has been fixed in #17111 by @gelanivishal in 2.1-develop branch
   Related commits:
     1. deb05f1
     2. 784d167

 - #13006: Drop down values are not showing in catalog product grid magento2 (reported by @ramusadwika) has been fixed in #17088 by @mageprince in 2.1-develop branch
   Related commits:
     1. c1f1313

Author: Stanislav Idolov

app/code/Magento/CatalogWidget/etc/widget.xml

@@ -33,7 +33,7 @@
             <parameter name="template" xsi:type="select" required="true" visible="true">
                 <label translate="true">Template</label>
                 <options>
-                    <option name="default" value="product/widget/content/grid.phtml" selected="true">
+                    <option name="default" value="Magento_CatalogWidget::product/widget/content/grid.phtml" selected="true">
                         <label translate="true">Products Grid Template</label>
                     </option>
                 </options>

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php

@@ -44,8 +44,8 @@ public function addOptionValueToCollection($collection, $attribute, $valueExpr)
         );
         $valueExpr = $connection->getCheckSql(
             "{$optionTable2}.value_id IS NULL",
-            "{$optionTable1}.value",
-            "{$optionTable2}.value"
+            "{$optionTable1}.option_id",
+            "{$optionTable2}.option_id"
         );
 
         $collection->getSelect()->joinLeft(

app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/RateQuery.php

@@ -99,7 +99,7 @@ public function getBindings()
             }
         } else {
             $bind[':condition_name'] = $this->request->getConditionName();
-            $bind[':condition_value'] = $this->request->getData($this->request->getConditionName());
+            $bind[':condition_value'] = round($this->request->getData($this->request->getConditionName()), 4);
         }
 
         return $bind;

app/code/Magento/Theme/Block/Html/Footer.php

@@ -54,7 +54,6 @@ protected function _construct()
     {
         $this->addData(
             [
-                'cache_lifetime' => false,
                 'cache_tags' => [\Magento\Store\Model\Store::CACHE_TAG, \Magento\Cms\Model\Block::CACHE_TAG],
             ]
         );
@@ -119,4 +118,14 @@ public function getIdentities()
     {
         return [\Magento\Store\Model\Store::CACHE_TAG, \Magento\Cms\Model\Block::CACHE_TAG];
     }
+
+    /**
+     * Get block cache life time
+     *
+     * @return int
+     */
+    protected function getCacheLifetime()
+    {
+        return parent::getCacheLifetime() ?: 3600;
+    }
 }

app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php

@@ -174,7 +174,7 @@ public function testGetWidgetDeclaration()
             'show_pager' => '1',
             'products_per_page' => '5',
             'products_count' => '10',
-            'template' => 'product/widget/content/grid.phtml',
+            'template' => 'Magento_CatalogWidget::product/widget/content/grid.phtml',
             'conditions' => $conditions
         ];
 
@@ -187,7 +187,10 @@ public function testGetWidgetDeclaration()
                 ['1', false, '1'],
                 ['5', false, '5'],
                 ['10', false, '10'],
-                ['product/widget/content/grid.phtml', false, 'product/widget/content/grid.phtml'],
+                ['Magento_CatalogWidget::product/widget/content/grid.phtml',
+                 false,
+                 'Magento_CatalogWidget::product/widget/content/grid.phtml'
+                ],
                 ['encoded-conditions-string', false, 'encoded-conditions-string'],
             ]);
 
@@ -225,7 +228,7 @@ public function testGetWidgetDeclarationWithZeroValueParam()
             'show_pager' => '1',
             'products_per_page' => '5',
             'products_count' => '0',
-            'template' => 'product/widget/content/grid.phtml',
+            'template' => 'Magento_CatalogWidget::product/widget/content/grid.phtml',
             'conditions' => $conditions
         ];
 

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less

@@ -121,7 +121,7 @@
         }
 
         .mage-suggest-selected > a {
-            color: #000;
+            color: @color-black;
             background: #F1FFEB;
         }
     }

app/design/adminhtml/Magento/backend/web/css/styles-old.less

@@ -487,8 +487,8 @@
     }
 
     .notification-entry-dialog .action-close:hover {
-        color: #000;
-        border-bottom-color: #000;
+        color: @color-black;
+        border-bottom-color: @color-black;
         filter: none;
     }
 
@@ -3794,7 +3794,7 @@
     }
 
     .rule-param .label {
-        color: #000;
+        color: @color-black;
         float: none;
         text-align: left;
         padding: 0;
@@ -5211,7 +5211,7 @@
 @media print {
     * {
         background: transparent !important;
-        color: #000 !important;
+        color: @color-black !important;
         box-shadow: none !important;
         text-shadow: none !important;
         filter: none !important;

lib/web/css/docs/source/_buttons.less

@@ -48,10 +48,10 @@ button {
     &.example-button-3 {
         .lib-button-s();
         border-radius: 0;
-        color: #000;
+        color: @color-black;
         &:hover,
         &.active {
-            color: #000;
+            color: @color-black;
         }
     }
 }

lib/web/css/docs/source/_messages.less

@@ -176,7 +176,7 @@
 //  ```
 //
 
-@message-custom__color: #000;
+@message-custom__color: @color-black;
 @message-custom__background: #fc0;
 @message-custom__border-color: orange;
 
@@ -185,7 +185,7 @@
 @message-custom-link__color-active: darken(@message-custom-link__color, 30%);
 
 @message-custom-icon: @icon-settings;
-@message-custom-icon__color-lateral: #000;
+@message-custom-icon__color-lateral: @color-black;
 @message-custom-icon__background: #green;
 @message-custom-icon__top: 15px;
 @message-custom-icon__right: false;

lib/web/css/docs/source/_tables.less

@@ -1253,7 +1253,7 @@
     .lib-table();
     .lib-table-striped(
         @_stripped-background-color: #ffc,
-        @_stripped-color: #000,
+        @_stripped-color: @color-black,
         @_stripped-direction: horizontal,
         @_stripped-highlight: even
     );