Merge branch 'MAGETWO-45055' of github.corp.magento.com:magento-vanilla/magento2ce into PR

Author: slopok

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml

@@ -8,7 +8,7 @@
 
 /** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
 ?>
-<fieldset class="fieldset ignore-validate">
+<fieldset class="fieldset">
     <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Options (values of your attribute)') ?></span></legend>
     <div id="manage-options-panel">
         <table class="admin__control-table">
@@ -27,8 +27,14 @@
                     <th class="col-delete">&nbsp;</th>
                 </tr>
             </thead>
-            <tbody data-role="options-container"></tbody>
+            <tbody data-role="options-container" class="ignore-validate"></tbody>
             <tfoot>
+            <tr>
+                <th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="validation">
+                    <input type="hidden" class="required-dropdown-attribute-entry" name="dropdown_attribute_validation"/>
+                </th>
+            </tr>
+            <tr>
                 <th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="col-actions-add">
                     <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
                         <button id="add_new_option_button" title="<?php /* @escapeNotVerified */ echo __('Add Option'); ?>"
@@ -37,6 +43,7 @@
                         </button>
                     <?php endif; ?>
                 </th>
+            </tr>
             </tfoot>
         </table>
         <input type="hidden" id="option-count-check" value="" />

app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml

@@ -37,7 +37,7 @@
             <tfoot>
             <tr>
                 <th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>">
-                    <input type="hidden" class="required-swatch-entry"/>
+                    <input type="hidden" class="required-text-swatch-entry" name="text_swatch_validation"/>
                 </th>
             </tr>
             <tr>

app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml

@@ -33,7 +33,7 @@
             <tfoot>
             <tr>
                 <th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>">
-                    <input type="hidden" class="required-swatch-entry"/>
+                    <input type="hidden" class="required-visual-swatch-entry" name="visual_swatch_validation"/>
                 </th>
             </tr>
             <tr>

app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less

@@ -32,6 +32,10 @@
     tfoot {
         th {
             padding-bottom: @control-table-cell__padding-vertical;
+            &.validation {
+              padding-bottom: 0;
+              padding-top: 0;
+            }
         }
     }
     tr {

lib/web/mage/validation.js

@@ -141,6 +141,23 @@
     }
 
     /**
+     * validate all table required inputs at once, using single hidden input
+     * @param {String} value
+     * @param {HTMLElement} element
+     *
+     * @return {Boolean}
+     */
+    function tableSingleValidation (value, element) {
+        var empty = $(element).closest('table')
+            .find('input.required-option:visible')
+            .filter(function(i, el){
+                return $.mage.isEmpty(el.value);
+            })
+            .length;
+        return empty === 0;
+    }
+
+        /**
      * Collection of validation rules including rules from additional-methods.js
      * @type {Object}
      */
@@ -1239,16 +1256,17 @@
             },
             'Please enter a valid number.'
         ],
-        'required-swatch-entry': [
-            function (value, element) {
-                var empty = $(element).closest('table')
-                    .find('input.required-option:visible')
-                    .filter(function(i, el){
-                        return $.mage.isEmpty(el.value);
-                    })
-                    .length;
-                return empty === 0;
-            }, 'Admin is a required field in the each row.'
+        'required-text-swatch-entry': [
+            tableSingleValidation,
+            'Swatch and Admin are the required fields in the each row.'
+        ],
+        'required-visual-swatch-entry': [
+            tableSingleValidation,
+            'Admin is a required field in the each row.'
+        ],
+        'required-dropdown-attribute-entry': [
+            tableSingleValidation,
+            'Admin is a required field in the each row.'
         ],
         'validate-item-quantity': [
             function (value, element, params) {