Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure store-scoped values are selected before default #2966

Merged
merged 3 commits into from
May 12, 2023
Merged

Ensure store-scoped values are selected before default #2966

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f9cc29
Ensure store-scoped values selected before default
mattdavenport Jan 17, 2023
25f2475
suggestion by colin
fballiano May 11, 2023
581d2af
Merge branch 'main' into fix/category-default-scope-bug
fballiano May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/code/core/Mage/Catalog/Model/Resource/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ protected function _getLoadAttributesSelect($object, $table)
->from(['attr_table' => $table], [])
->where("attr_table.{$this->getEntityIdField()} = ?", $object->getId())
->where('attr_table.store_id IN (?)', $storeIds);
if (count($storeIds) > 1) {
$select->order('attr_table.store_id ASC');
}
if ($setId) {
$select->join(
['set_table' => $this->getTable('eav/entity_attribute')],
Expand Down