Merge remote-tracking branch 'troll/MAGETWO-51942' into troll-bugs

Author: vzabaznov

app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php

@@ -67,12 +67,12 @@ public function execute()
                 throw new \Exception(__('Category is not available for requested store.'));
             }
             $category->move($parentNodeId, $prevNodeId);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $error = true;
-            $this->messageManager->addError(__('There was a category move error.'));
         } catch (\Magento\Framework\Exception\AlreadyExistsException $e) {
             $error = true;
             $this->messageManager->addError(__('There was a category move error. %1', $e->getMessage()));
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $error = true;
+            $this->messageManager->addError($e->getMessage());
         } catch (\Exception $e) {
             $error = true;
             $this->messageManager->addError(__('There was a category move error.'));

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

@@ -493,6 +493,9 @@
                                     } else {
                                         $(obj.tree.container.dom).trigger('categoryMove.tree');
                                     }
+                                    $('.page-main-actions').next('.messages').remove();
+                                    $('.page-main-actions').next('#messages').remove();
+                                    $('.page-main-actions').after(data.messages);
                                 }).fail(function (jqXHR, textStatus) {
                                     if (window.console) {
                                         console.log(textStatus);