From 74124ccb54d852b90e212dc9ce6d0f7bacfc4b9e Mon Sep 17 00:00:00 2001 From: andresmr Date: Thu, 19 Dec 2024 08:40:13 +0100 Subject: [PATCH] fix: [ANDROAPP-6535] add default relationship name Signed-off-by: andresmr --- .../tracker/relationships/data/RelationshipsRepository.kt | 6 ++++-- tracker/src/main/res/values/strings.xml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tracker/src/main/kotlin/org/dhis2/tracker/relationships/data/RelationshipsRepository.kt b/tracker/src/main/kotlin/org/dhis2/tracker/relationships/data/RelationshipsRepository.kt index 77c4062769a..93ccfa25099 100644 --- a/tracker/src/main/kotlin/org/dhis2/tracker/relationships/data/RelationshipsRepository.kt +++ b/tracker/src/main/kotlin/org/dhis2/tracker/relationships/data/RelationshipsRepository.kt @@ -268,11 +268,13 @@ abstract class RelationshipsRepository( ): String { return when (entitySide) { RelationshipConstraintType.FROM -> { - relationshipType.fromToName() ?: relationshipType.displayName() ?: "" + relationshipType.fromToName() ?: relationshipType.displayName() + ?: resources.getString(R.string.relationship) } RelationshipConstraintType.TO -> { - relationshipType.toFromName() ?: relationshipType.displayName() ?: "" + relationshipType.toFromName() ?: relationshipType.displayName() + ?: resources.getString(R.string.relationship) } } } diff --git a/tracker/src/main/res/values/strings.xml b/tracker/src/main/res/values/strings.xml index 53478afd2cd..3659326363d 100644 --- a/tracker/src/main/res/values/strings.xml +++ b/tracker/src/main/res/values/strings.xml @@ -7,4 +7,5 @@ Remove %d selected relationships? The %d selected relationships will be deleted. This action cannot be undone. Show %d more... + Relationship \ No newline at end of file