MAGETWO-31861: Cannot submit product form by pressing Enter in any field

Denys Rul · Denys Rul · commit ebb98c698565 · 2015-02-03T18:16:11.000+02:00
- Specify buttons type
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
@@ -24,7 +24,7 @@
                 <strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
                 <span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
                 <time class="notifications-entry-time"><?php echo $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())); ?></time>
-                <button class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
+                <button type="button" class="action close notifications-close"><span><?php echo __('Close'); ?></span></button>
                 <div class="notifications-dialog-content" data-title="<?php echo __('Notification'); ?>" data-cancel-caption="<?php echo  __('Cancel'); ?>" data-acknowledge-caption="<?php echo __('Acknowledge'); ?>">
                     <strong class="notifications-entry-title"><?php echo $block->escapeHtml($notification->getTitle()); ?></strong>
                     <span class="notifications-entry-description"><?php echo $block->escapeHtml($notification->getDescription()); ?></span>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -25,7 +25,7 @@
                data-role="website-id" data-param="<?php echo $block->getWebsiteVarName() ?>"
                value="<?php echo $block->escapeHtml($block->getWebsiteId()) ?>"
                onchange="switchScope(this);"<?php echo $block->getUiId()?> />
-        <button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
+        <button type="button" class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
             <span><?php echo $block->getCurrentSelectionName() ?></span>
         </button>
         <ul class="dropdown-menu" data-role="stores-list">
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
@@ -110,10 +110,10 @@ public function getElementHtml()
             <img class="spacer" src="{$spacerImage}"/>
             <img class="product-image" src="\${url}" data-position="\${position}" alt="\${label}" />
             <div class="actions">
-                <button class="action-delete" data-role="delete-button" title="{$deleteImageText}">
+                <button type="button" class="action-delete" data-role="delete-button" title="{$deleteImageText}">
                     <span>{$deleteImageText}</span>
                 </button>
-                <button class="action-make-base" data-role="make-base-button" title="{$makeBaseText}">
+                <button type="button" class="action-make-base" data-role="make-base-button" title="{$makeBaseText}">
                     <span>{$makeBaseText}</span>
                 </button>
                 <div class="draggable-handle"></div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
@@ -16,7 +16,7 @@
 <div class="product-actions">
     <div id="product-template-suggest-container" class="suggest-expandable">
         <div class="action-dropdown">
-            <button class="action-toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
+            <button type="button" class="action-toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
                 <span><?php echo $block->getAttributeSetName()?></span>
             </button>
             <ul class="dropdown-menu">
@@ -54,6 +54,7 @@
     <?php echo $block->getChildHtml('product-type-tabs') ?>
     <input type="hidden" id="product_type_id" value="<?php echo $block->getProduct()->getTypeId()?>"/>
     <input type="hidden" id="attribute_set_id" value="<?php echo $block->getProduct()->getAttributeSetId()?>"/>
+    <button type="submit" class="hidden"></button>
 <?php if ($block->getUseContainer()): ?>
 </form>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
@@ -18,7 +18,7 @@
     {{/each}}
 </ul>
 {{if !term && items.length && !$data.allShown()}}
-<button data-mage-init='{"actionLink":{"event":"showAll"}}' class="action-show-all">
+<button type="button" data-mage-init='{"actionLink":{"event":"showAll"}}' class="action-show-all">
     <span>Show all Templates...</span>
 </button>
 {{/if}}
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
@@ -10,7 +10,7 @@
 ?>
 <div id="product-attribute-search-container" class="suggest-expandable attribute-selector">
     <div class="action-dropdown">
-        <button class="action-toggle action-choose" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
+        <button type="button" class="action-toggle action-choose" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
             <span><?php echo __('Add Attribute') ?></span>
         </button>
         <div class="dropdown-menu">
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Element/Button.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Element/Button.php
@@ -33,7 +33,7 @@ public function getElementHtml()
             );
         }
         $html .= sprintf(
-            '<button id="%s" %s %s><span>%s</span></button>',
+            '<button type="button" id="%s" %s %s><span>%s</span></button>',
             $this->getHtmlId(),
             $this->_getUiId(),
             $this->serialize($this->getHtmlAttributes()),
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/background-uploader.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/form/renderer/background-uploader.phtml
@@ -23,7 +23,7 @@ $element = $block->getElement();
             <div class="no-display uploaded-image" id="<?php echo $imageUploader->getHtmlId(); ?>-template">
                 <div class="file-row">
                     <span class="label">{{name}}</span>
-                    <button class="action-delete" id="{{remove-id}}">
+                    <button type="button" class="action-delete" id="{{remove-id}}">
                         <span><?php echo __('Remove'); ?></span>
                     </button>
                 </div>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools.phtml
@@ -12,7 +12,7 @@
 <section class="vde-tools">
     <header class="vde-tools-header">
         <div class="vde-tools-header-inner">
-            <button class="action-close" title="<?php echo __('Close Panel'); ?>">
+            <button type="button" class="action-close" title="<?php echo __('Close Panel'); ?>">
                 <span><?php echo __('Close Panel'); ?></span>
             </button>
         </div>
@@ -66,7 +66,7 @@
 <div class="vde-message no-display" id="vde-message-template">
     <div class="message-inner">
         <div class="message-content">${message}</div>
-        <button class="action-close" title="<?php echo __('Close Message'); ?>">
+        <button type="button" class="action-close" title="<?php echo __('Close Message'); ?>">
             <span><?php echo __('Close Message'); ?></span>
         </button>
     </div>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/custom.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/code/custom.phtml
@@ -22,7 +22,7 @@
             <div class="uploaded-css">
                 <div class="file-row">
                     <span id="custom-file-name" class="label"><?php echo $block->getCustomFileName() ?></span>
-                    <button data-action="delete" class="action-delete" title="<?php echo __('Delete File'); ?>">
+                    <button type="button" data-action="delete" class="action-delete" title="<?php echo __('Delete File'); ?>">
                         <span><?php echo __('Delete File'); ?></span>
                     </button>
                     <button data-action="download" class="action-download" title="<?php echo __('Download File'); ?>">
@@ -33,10 +33,10 @@
         </div>
     </div>
     <div class="manage-assets-buttons">
-        <button data-manage="images" class="action-image-assets" title="<?php echo __('Image Assets'); ?>">
+        <button type="button" data-manage="images" class="action-image-assets" title="<?php echo __('Image Assets'); ?>">
             <span><?php echo __('Image Assets'); ?></span>
         </button>
-        <button data-manage="fonts" class="action-font-assets" title="<?php echo __('Font Assets'); ?>">
+        <button type="button" data-manage="fonts" class="action-font-assets" title="<?php echo __('Font Assets'); ?>">
             <span><?php echo __('Font Assets'); ?></span>
         </button>
     </div>
@@ -45,7 +45,7 @@
     <div class="textarea-container">
         <textarea name="custom_code" id="custom_code" cols="30" rows="10"><?php echo $block->getCustomCssContent() ?></textarea>
     </div>
-    <button data-action="update" class="action-update primary" title="<?php echo __('Update'); ?>">
+    <button type="button" data-action="update" class="action-update primary" title="<?php echo __('Update'); ?>">
         <span><?php echo __('Update'); ?></span>
     </button>
 </div>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/content/uploader.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/content/uploader.phtml
@@ -18,7 +18,7 @@
               </span>
               <span class="file-icon">
                   <span class="file-info-cancel">
-                      <button class="action-delete" data-delete-file="${id}">
+                      <button type="button" class="action-delete" data-delete-file="${id}">
                           <span><?php echo __('Remove'); ?></span>
                       </button>
                   </span>
@@ -39,13 +39,13 @@
 </div>
 <div class="form-buttons">
     <span class="fileinput-button">
-            <button class="action-default primary" data-action="browse" type="submit">
+            <button type="button" class="action-default primary" data-action="browse" type="submit">
                 <?php echo __('Browse Files'); ?>
             </button>
             <input data-action="fileinput" type="file" name="<?php echo $block->getConfig()->getFileField() ?>"
                    data-url="<?php echo $block->getConfig()->getUrl() ?>" multiple>
     </span>
-    <button class="no-display action-default primary" data-action="upload">
+    <button type="button" class="no-display action-default primary" data-action="upload">
         <?php echo __('Upload Files'); ?>
     </button>
 </div>
diff --git a/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/tree.phtml b/app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/tree.phtml
@@ -13,10 +13,10 @@
 ?>
 
 <div class="categories-side-col">
-    <button data-folder="create" class="action-folder-create" title="<?php echo __('Create Folder'); ?>">
+    <button type="button" data-folder="create" class="action-folder-create" title="<?php echo __('Create Folder'); ?>">
         <span><?php echo __('Create Folder'); ?></span>
     </button>
-    <button data-folder="delete" class="action-delete">
+    <button type="button" data-folder="delete" class="action-delete">
         <span><?php echo __('Delete Folder'); ?></span>
     </button>
     <p></p>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/checkout/cart/item/default.phtml b/app/code/Magento/Downloadable/view/frontend/templates/checkout/cart/item/default.phtml
@@ -115,6 +115,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                     <a class="action edit" href="<?php echo $block->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><span><?php echo __('Edit') ?></span></a>
                 <?php endif ?>
                 <button title="<?php echo __('Remove item') ?>"
+                        type="button"
                         class="action delete"
                         data-post='<?php echo $this->helper('Magento\Checkout\Helper\Cart')->getDeletePostJson($_item); ?>'>
                     <span><?php echo __('Remove item')?></span>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
@@ -15,7 +15,7 @@
         <option value="<?php echo $_queue['value'] ?>"><?php echo $_queue['label'] ?> #<?php echo $_queue['value'] ?></option>
     <?php endforeach; ?>
     </select>
-    <button class="scalable" onclick="subscriberController.addToQueue();"><span><span><span><?php echo __('Add to Queue'); ?></span></span></span></button>
+    <button type="button" class="scalable" onclick="subscriberController.addToQueue();"><span><span><span><?php echo __('Add to Queue'); ?></span></span></span></button>
 </div>
 <?php endif ?>
 <script>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button onclick="window.location.href='<?php echo $createUrl ?>'">
+    <button type="button" onclick="window.location.href='<?php echo $createUrl ?>'">
         <?php echo __('Add New Class') ?>
     </button>
 </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button onclick="window.location.href='<?php echo $createUrl ?>'">
+    <button type="button" onclick="window.location.href='<?php echo $createUrl ?>'">
         <?php echo __('Add New Tax Rule') ?>
     </button>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
@@ -66,7 +66,7 @@ require(['jquery'], function(jQuery){
                 <span><?php echo __('To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.') ?></span>
                 <?php echo __('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()) ?></p>
             <div class="actions">
-                <button id="btn-cookie-allow" class="action allow primary">
+                <button type="button" id="btn-cookie-allow" class="action allow primary">
                     <span><?php echo __('Allow Cookies');?></span>
                 </button>
             </div>

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function getElementHtml()`
`33`	`33`	`);`
`34`	`34`	`}`
`35`	`35`	`$html .= sprintf(`
`36`		`- '<button id="%s" %s %s><span>%s</span></button>',`
	`36`	`+ '<button type="button" id="%s" %s %s><span>%s</span></button>',`
`37`	`37`	`$this->getHtmlId(),`
`38`	`38`	`$this->_getUiId(),`
`39`	`39`	`$this->serialize($this->getHtmlAttributes()),`