MC-31205: Minor changes in product attribute save controller

SeruyV · SeruyV · commit fd3e410a0695 · 2020-02-11T16:42:19.000+02:00
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -221,7 +221,7 @@ public function execute()
                     return $this->returnResult('catalog/*/', [], ['error' => true]);
                 }
                 // entity type check
-                if ($model->getEntityTypeId() != $this->_entityTypeId) {
+                if ($model->getEntityTypeId() != $this->_entityTypeId || isset($data['backend_model'])) {
                     $this->messageManager->addErrorMessage(__('We can\'t update the attribute.'));
                     $this->_session->setAttributeData($data);
                     return $this->returnResult('catalog/*/', [], ['error' => true]);

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ public function execute()`
`221`	`221`	`return $this->returnResult('catalog/*/', [], ['error' => true]);`
`222`	`222`	`}`
`223`	`223`	`// entity type check`
`224`		`- if ($model->getEntityTypeId() != $this->_entityTypeId) {`
	`224`	`+ if ($model->getEntityTypeId() != $this->_entityTypeId \|\| isset($data['backend_model'])) {`
`225`	`225`	`$this->messageManager->addErrorMessage(__('We can\'t update the attribute.'));`
`226`	`226`	`$this->_session->setAttributeData($data);`
`227`	`227`	`return $this->returnResult('catalog/*/', [], ['error' => true]);`