hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

add-salut-and-title-to-person #25

Merged
hsh-marcsandlus merged 6 commits from add-salut-and-title-to-person into master 2024-04-08 10:28:10 +02:00
Conversation 0 Commits 6 Files Changed 7 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 898aa858b1 - Show all commits

2
src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java
View File

@ -70,7 +70,7 @@ public class HsOfficePersonEntity implements RbacObject, Stringifyable {
@Override
public String toShortString() {
return personType + " " +
(!StringUtils.isEmpty(tradeName) ? tradeName : (StringUtils.isEmpty(salutation) ? "" : salutation + " ") + (familyName + ", " + givenName));
(!StringUtils.isEmpty(tradeName) ? tradeName : (familyName + ", " + givenName));
}
public static RbacView rbac() {

4
src/test/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntityUnitTest.java
View File

@ -72,7 +72,7 @@ class HsOfficePersonEntityUnitTest {
final var actualDisplay = givenPersonEntity.toShortString();
assertThat(actualDisplay).isEqualTo("NP Frau Dr. some family name, some given name");
assertThat(actualDisplay).isEqualTo("NP some family name, some given name");
}
@Test
@ -100,7 +100,7 @@ class HsOfficePersonEntityUnitTest {
final var actualDisplay = givenPersonEntity.toShortString();
assertThat(actualDisplay).isEqualTo("NP Dr. Dr. some family name, some given name");
assertThat(actualDisplay).isEqualTo("NP some family name, some given name");
}
@Test