admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix relation between standard objects (#2878)

Browse Source
This commit is contained in:
Weiko
2023-12-08 15:50:12 +01:00
committed by GitHub
parent 88abb11448
commit b68f5cda97
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
View File

@ -142,7 +142,7 @@ export const SettingsObjectNewFieldStep2 = () => {
objectViews.forEach(async (view) => { objectViews.forEach(async (view) => {
await createOneViewField?.({ await createOneViewField?.({
view: view.id, viewId: view.id,
fieldMetadataId: fieldMetadataId:
validatedFormValues.relation.type === 'MANY_TO_ONE' validatedFormValues.relation.type === 'MANY_TO_ONE'
? createdRelation.data?.createOneRelation.toFieldMetadataId ? createdRelation.data?.createOneRelation.toFieldMetadataId
@ -154,7 +154,7 @@ export const SettingsObjectNewFieldStep2 = () => {
}); });
relationObjectViews.forEach(async (view) => { relationObjectViews.forEach(async (view) => {
await createOneViewField?.({ await createOneViewField?.({
view: view.id, viewId: view.id,
fieldMetadataId: fieldMetadataId:
validatedFormValues.relation.type === 'MANY_TO_ONE' validatedFormValues.relation.type === 'MANY_TO_ONE'
? createdRelation.data?.createOneRelation.fromFieldMetadataId ? createdRelation.data?.createOneRelation.fromFieldMetadataId

14
server/src/metadata/relation-metadata/relation-metadata.service.ts
View File

@ -137,11 +137,11 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
description: record.toDescription, description: record.toDescription,
icon: record.toIcon, icon: record.toIcon,
isCustom: true, isCustom: true,
targetColumnMap: isToCustom targetColumnMap: {
? { value: isToCustom
value: createCustomColumnName(record.toName), ? createCustomColumnName(record.toName)
} : record.toName,
: {}, },
isActive: true, isActive: true,
type: FieldMetadataType.RELATION, type: FieldMetadataType.RELATION,
objectMetadataId: record.toObjectMetadataId, objectMetadataId: record.toObjectMetadataId,
@ -151,7 +151,9 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
{ {
name: baseColumnName, name: baseColumnName,
label: `${record.toLabel} Foreign Key`, label: `${record.toLabel} Foreign Key`,
description: `${record.toDescription} Foreign Key`, description: record.toDescription
? `${record.toDescription} Foreign Key`
: undefined,
icon: undefined, icon: undefined,
isCustom: true, isCustom: true,
targetColumnMap: { targetColumnMap: {