From 59dd0db5300a4a4f580f51e2bd8d21db74ca05ed Mon Sep 17 00:00:00 2001
From: Eden <eden@magestore.com>
Date: Sat, 4 Apr 2020 19:44:50 +0700
Subject: [PATCH 1/2] Fix wrong position of button list when load "New
 Attribute" page

---
 .../Adminhtml/Product/Attribute/Edit.php      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index 6ab039aa27849..7c680a108adf8 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -42,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * Construct block
+     *
      * @return void
      */
     protected function _construct()
@@ -51,6 +53,14 @@ protected function _construct()
 
         parent::_construct();
 
+        $this->buttonList->update('save', 'label', __('Save Attribute'));
+        $this->buttonList->update('save', 'class', 'save primary');
+        $this->buttonList->update(
+            'save',
+            'data_attribute',
+            ['mage-init' => ['button' => ['event' => 'save', 'target' => '#edit_form']]]
+        );
+
         if ($this->getRequest()->getParam('popup')) {
             $this->buttonList->remove('back');
             if ($this->getRequest()->getParam('product_tab') != 'variations') {
@@ -64,6 +74,8 @@ protected function _construct()
                     100
                 );
             }
+            $this->buttonList->update('reset', 'level', 10);
+            $this->buttonList->update('save', 'class', 'save action-secondary');
         } else {
             $this->addButton(
                 'save_and_edit_button',
@@ -79,14 +91,6 @@ protected function _construct()
             );
         }
 
-        $this->buttonList->update('save', 'label', __('Save Attribute'));
-        $this->buttonList->update('save', 'class', 'save primary');
-        $this->buttonList->update(
-            'save',
-            'data_attribute',
-            ['mage-init' => ['button' => ['event' => 'save', 'target' => '#edit_form']]]
-        );
-
         $entityAttribute = $this->_coreRegistry->registry('entity_attribute');
         if (!$entityAttribute || !$entityAttribute->getIsUserDefined()) {
             $this->buttonList->remove('delete');
@@ -96,7 +100,7 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {

From 1dd4e1bbd58525b83373da00f691bd2daf4ede60 Mon Sep 17 00:00:00 2001
From: Eden <eden@magestore.com>
Date: Sat, 4 Apr 2020 21:16:10 +0700
Subject: [PATCH 2/2] Fix static test

---
 .../Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index 7c680a108adf8..efb7d6dbbeff3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -107,7 +107,7 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
         if ($this->getRequest()->getParam('popup')) {
             $region = 'header';
         }
-        parent::addButton($buttonId, $data, $level, $sortOrder, $region);
+        return parent::addButton($buttonId, $data, $level, $sortOrder, $region);
     }
 
     /**