Skip to content

fix(customfields): map FieldSet.entity via e.clientName, not e.name #1535

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

Open
michalcharvat wants to merge 1 commit into
base: 6.8.x
Choose a base branch
from
+5 −2
Open

fix(customfields): map FieldSet.entity via e.clientName, not e.name #1535

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions www/go/core/model/FieldSet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ protected static function defineMapping(): Mapping
{
return parent::defineMapping()
->addTable('core_customfields_field_set', 'fs')
->addQuery((new Query())->select("e.name AS entity")->join('core_entity', 'e', 'e.id = fs.entityId'));
// clientName, NOT name: EntityType::findByName() indexes by client
// name, so entities whose clientName differs from the raw name
// (module-prefixed ones) would break Field::tableName() otherwise.
->addQuery((new Query())->select("e.clientName AS entity")->join('core_entity', 'e', 'e.id = fs.entityId'));
}

public function getEntity() {
Expand All @@ -122,7 +125,7 @@ protected static function defineFilters(): Filters
{
return parent::defineFilters()
->add('entities', function(Criteria $criteria, $value) {
$criteria->andWhere('e.name', 'IN', $value);
$criteria->andWhere('e.clientName', 'IN', $value);
})
->add('isTab', function(Criteria $criteria, $value) {
$criteria->andWhere('isTab', '=', $value);
Expand Down