Merge remote-tracking branch 'origin/MAGETWO-54631' into bugfixes

Author: Natalia Momotenko

app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php

@@ -160,6 +160,7 @@ protected function _prepareForm()
                 'label' => __('From'),
                 'title' => __('From'),
                 'required' => true,
+                'css_class' => 'admin__field-small',
                 'class' => 'admin__control-text'
             ]
         );
@@ -173,6 +174,7 @@ protected function _prepareForm()
                 'label' => __('To'),
                 'title' => __('To'),
                 'required' => true,
+                'css_class' => 'admin__field-small',
                 'class' => 'admin__control-text'
             ]
         );

app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml

@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
 
 ?>
 
@@ -24,11 +23,15 @@ require([
 //<![CDATA[
     jQuery('#filter_form').mage('validation', {errorClass: 'mage-error'});
     function filterFormSubmit() {
-        var filters = $$('#filter_form input', '#filter_form select');
-        var elements = [];
-        for(var i in filters){
-            if(filters[i].value && filters[i].value.length && !filters[i].disabled) elements.push(filters[i]);
+        var filters = $$('#filter_form input', '#filter_form select'),
+            elements = [];
+
+        for (var i in filters) {
+            if (filters[i].value && filters[i].value.length && !filters[i].disabled) {
+                elements.push(filters[i]);
+            }
         }
+
         if (jQuery('#filter_form').valid()) {
             setLocation('<?php /* @escapeNotVerified */ echo $block->getFilterUrl(); ?>filter/'+Base64.encode(Form.serializeElements(elements))+'/');
         }

lib/web/mage/validation.js

@@ -1476,8 +1476,8 @@
             errorPlacement: function (error, element) {
                 var errorPlacement = element;
                 // logic for date-picker error placement
-                if (element.hasClass('hasDatepicker')) {
-                    errorPlacement = element.siblings('img');
+                if (element.hasClass('_has-datepicker')) {
+                    errorPlacement = element.siblings('button');
                 }
                 // logic for field wrapper
                 var fieldWrapper = element.closest('.addon');
@@ -1488,6 +1488,10 @@
                 if (element.is(':checkbox') || element.is(':radio')) {
                     errorPlacement = element.siblings('label').last();
                 }
+                //logic for control with tooltip
+                if (element.siblings('.tooltip').length) {
+                     errorPlacement = element.siblings('.tooltip');
+                }
                 errorPlacement.after(error);
             }
         },