Fixed setting of source_model when adding new attribute and for multiselect (#1293)

kiatng · fballiano · commit 9b02cf2c1047 · 2022-11-25T08:57:21.000Z
diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute.php
@@ -161,12 +161,10 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
         }
 
         /**
-         * @todo need use default source model of entity type !!!
+         * Set default source model.
          */
-        if (!$object->getId()) {
-            if ($object->getFrontendInput() == 'select') {
-                $object->setSourceModel('eav/entity_attribute_source_table');
-            }
+        if ($object->usesSource() && !$object->getData('source_model')) {
+            $object->setSourceModel($object->_getDefaultSourceModel());
         }
 
         return parent::_beforeSave($object);

Original file line number	Diff line number	Diff line change
`@@ -161,12 +161,10 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`/**`
`164`		`- * @todo need use default source model of entity type !!!`
	`164`	`+ * Set default source model.`
`165`	`165`	`*/`
`166`		`- if (!$object->getId()) {`
`167`		`- if ($object->getFrontendInput() == 'select') {`
`168`		`- $object->setSourceModel('eav/entity_attribute_source_table');`
`169`		`- }`
	`166`	`+ if ($object->usesSource() && !$object->getData('source_model')) {`
	`167`	`+ $object->setSourceModel($object->_getDefaultSourceModel());`
`170`	`168`	`}`
`171`	`169`
`172`	`170`	`return parent::_beforeSave($object);`