Skip to content

Commit b958111

Browse files
andresmrxavimolloy
authored andcommitted
fix: [ANDROAPP-6535] add default relationship name
Signed-off-by: andresmr <[email protected]>
1 parent afa4541 commit b958111

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

tracker/src/main/kotlin/org/dhis2/tracker/relationships/data/RelationshipsRepository.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,13 @@ abstract class RelationshipsRepository(
268268
): String {
269269
return when (entitySide) {
270270
RelationshipConstraintType.FROM -> {
271-
relationshipType.fromToName() ?: relationshipType.displayName() ?: ""
271+
relationshipType.fromToName() ?: relationshipType.displayName()
272+
?: resources.getString(R.string.relationship)
272273
}
273274

274275
RelationshipConstraintType.TO -> {
275-
relationshipType.toFromName() ?: relationshipType.displayName() ?: ""
276+
relationshipType.toFromName() ?: relationshipType.displayName()
277+
?: resources.getString(R.string.relationship)
276278
}
277279
}
278280
}

tracker/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
<string name="remove_some_relationships_title">Remove %d selected relationships?</string>
88
<string name="remove_some_relationships_desc">The %d selected relationships will be deleted. This action cannot be undone.</string>
99
<string name="show_number_more">Show %d more...</string>
10+
<string name="relationship">Relationship</string>
1011
</resources>

0 commit comments

Comments
 (0)