Merge remote-tracking branch 'nord/MAGETWO-37064' into MAGETWO-37718

magento · May 21, 2015 · 805f0cb · 805f0cb
2 parents 62e9e5b + fe1045a
commit 805f0cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
@@ -33,7 +33,7 @@ $categoryId = $block->getCategoryId();
 <?php endif; ?>
 <iframe name="iframeSave" style="display:none; width:100%;"
         src="<?php echo $block->getViewFileUrl('blank.html') ?>"></iframe>
-<form id="category_edit_form" action="<?php echo $block->getSaveUrl() ?>" method="post"
+<form id="category_edit_form" name="category_edit_form" action="<?php echo $block->getSaveUrl() ?>" method="post"
       enctype="multipart/form-data">
     <div class="no-display">
         <input type="hidden" name="isIframe" value="1"/>

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -526,7 +526,7 @@ function categoryMove(obj) {
                 showLoader: true
             }).done(function(data) {
                 if (data.messages && data.messages.length > 0) {
-                    $('.messages').html(data.messages);
+                    $('[name="category_edit_form"] .messages').html(data.messages);
                 }
                 if (data.error) {
                     reRenderTree();