Merge branch 'master' into w2p-64574_Item-page-entities

Conflicts:
	src/app/core/data/relationship.service.spec.ts
This commit is contained in:
Kristof De Langhe
2019-10-08 13:40:28 +02:00
189 changed files with 2379 additions and 762 deletions

View File

@@ -201,9 +201,9 @@ export class RelationshipService extends DataService<Relationship> {
map(([leftItems, rightItems, relTypesCurrentPage]) => {
return relTypesCurrentPage.map((type, index) => {
if (leftItems[index].uuid === item.uuid) {
return type.leftLabel;
return type.leftwardType;
} else {
return type.rightLabel;
return type.rightwardType;
}
});
}),