scottk/twenty
1
0
Fork 0
mirror of https://github.com/lingble/twenty.git synced 2025-11-01 21:27:58 +00:00
Code Issues 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) => {
await createOneViewField?.({
view: view.id,
viewId: view.id,
fieldMetadataId:
validatedFormValues.relation.type === 'MANY_TO_ONE'
? createdRelation.data?.createOneRelation.toFieldMetadataId
@@ -154,7 +154,7 @@ export const SettingsObjectNewFieldStep2 = () => {
});
relationObjectViews.forEach(async (view) => {
await createOneViewField?.({
view: view.id,
viewId: view.id,
fieldMetadataId:
validatedFormValues.relation.type === 'MANY_TO_ONE'
? 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,
icon: record.toIcon,
isCustom: true,
targetColumnMap: isToCustom
? {
value: createCustomColumnName(record.toName),
}
: {},
targetColumnMap: {
value: isToCustom
? createCustomColumnName(record.toName)
: record.toName,
},
isActive: true,
type: FieldMetadataType.RELATION,
objectMetadataId: record.toObjectMetadataId,
@@ -151,7 +151,9 @@ export class RelationMetadataService extends TypeOrmQueryService<RelationMetadat
{
name: baseColumnName,
label: `${record.toLabel} Foreign Key`,
description: `${record.toDescription} Foreign Key`,
description: record.toDescription
? `${record.toDescription} Foreign Key`
: undefined,
icon: undefined,
isCustom: true,
targetColumnMap: {