hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #461 from atmire/changes-to-relationship-type

Browse Source 
Rename relationship type properties
This commit is contained in:
benbosman
2019-10-02 18:23:04 +02:00
committed by GitHub
parent 2789996000 1008bd16e2
commit b85c76f40e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
View File

@@ -60,10 +60,10 @@ export const filterRelationsByTypeLabel = (label: string, thisId?: string) =>
return relatedItems$.pipe( return relatedItems$.pipe(
map((arr) => relsCurrentPage.filter((rel: Relationship, idx: number) => map((arr) => relsCurrentPage.filter((rel: Relationship, idx: number) =>
hasValue(relTypesCurrentPage[idx]) && ( hasValue(relTypesCurrentPage[idx]) && (
(hasNoValue(thisId) && (relTypesCurrentPage[idx].leftLabel === label || (hasNoValue(thisId) && (relTypesCurrentPage[idx].leftwardType === label ||
relTypesCurrentPage[idx].rightLabel === label)) || relTypesCurrentPage[idx].rightwardType === label)) ||
(thisId === arr[idx][0].id && relTypesCurrentPage[idx].leftLabel === label) || (thisId === arr[idx][0].id && relTypesCurrentPage[idx].leftwardType === label) ||
(thisId === arr[idx][1].id && relTypesCurrentPage[idx].rightLabel === label) (thisId === arr[idx][1].id && relTypesCurrentPage[idx].rightwardType === label)
) )
)) ))
); );

4
src/app/core/cache/models/items/normalized-relationship-type.model.ts vendored
View File

@@ -23,7 +23,7 @@ export class NormalizedRelationshipType extends NormalizedObject<RelationshipTyp
* The label that describes the Relation to the left of this RelationshipType * The label that describes the Relation to the left of this RelationshipType
*/ */
@autoserialize @autoserialize
leftLabel: string; leftwardType: string;
/** /**
* The maximum amount of Relationships allowed to the left of this RelationshipType * The maximum amount of Relationships allowed to the left of this RelationshipType
@@ -41,7 +41,7 @@ export class NormalizedRelationshipType extends NormalizedObject<RelationshipTyp
* The label that describes the Relation to the right of this RelationshipType * The label that describes the Relation to the right of this RelationshipType
*/ */
@autoserialize @autoserialize
rightLabel: string; rightwardType: string;
/** /**
* The maximum amount of Relationships allowed to the right of this RelationshipType * The maximum amount of Relationships allowed to the right of this RelationshipType

4
src/app/core/shared/item-relationships/relationship-type.model.ts
View File

@@ -33,7 +33,7 @@ export class RelationshipType implements CacheableObject {
/** /**
* The label that describes the Relation to the left of this RelationshipType * The label that describes the Relation to the left of this RelationshipType
*/ */
leftLabel: string; leftwardType: string;
/** /**
* The maximum amount of Relationships allowed to the left of this RelationshipType * The maximum amount of Relationships allowed to the left of this RelationshipType
@@ -48,7 +48,7 @@ export class RelationshipType implements CacheableObject {
/** /**
* The label that describes the Relation to the right of this RelationshipType * The label that describes the Relation to the right of this RelationshipType
*/ */
rightLabel: string; rightwardType: string;
/** /**
* The maximum amount of Relationships allowed to the right of this RelationshipType * The maximum amount of Relationships allowed to the right of this RelationshipType