Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit c435200

Browse files
SORMAS-Foundation#3510 Rename helper method LocationDto::isEmptyLocation to
::checkIsEmptyLocation ... so it is not transferred as json property
1 parent b119ed5 commit c435200

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

sormas-api/src/main/java/de/symeda/sormas/api/location/LocationDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ public LocationReferenceDto toReference() {
274274
additionalInformation);
275275
}
276276

277-
public boolean isEmptyLocation() {
277+
public boolean checkIsEmptyLocation() {
278278
return details == null
279279
&& city == null
280280
&& areaType == null

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public CommitDiscardWrapperComponent<ContactCreateForm> getContactCreateComponen
209209
// the relationship with the case has been set to living in the same household
210210
if (dto.getRelationToCase() == ContactRelation.SAME_HOUSEHOLD && dto.getCaze() != null) {
211211
PersonDto personDto = FacadeProvider.getPersonFacade().getPersonByUuid(selectedPerson.getUuid());
212-
if (personDto.getAddress().isEmptyLocation()) {
212+
if (personDto.getAddress().checkIsEmptyLocation()) {
213213
CaseDataDto caseDto = FacadeProvider.getCaseFacade().getCaseDataByUuid(dto.getCaze().getUuid());
214214
personDto.getAddress().setRegion(caseDto.getRegion());
215215
personDto.getAddress().setDistrict(caseDto.getDistrict());
@@ -291,7 +291,7 @@ public void onCommit() {
291291
// the relationship with the case has been set to living in the same household
292292
if (dto.getRelationToCase() == ContactRelation.SAME_HOUSEHOLD && dto.getCaze() != null) {
293293
PersonDto person = FacadeProvider.getPersonFacade().getPersonByUuid(dto.getPerson().getUuid());
294-
if (person.getAddress().isEmptyLocation()) {
294+
if (person.getAddress().checkIsEmptyLocation()) {
295295
CaseDataDto caze = FacadeProvider.getCaseFacade().getCaseDataByUuid(dto.getCaze().getUuid());
296296
person.getAddress().setRegion(caze.getRegion());
297297
person.getAddress().setDistrict(caze.getDistrict());

0 commit comments

Comments
 (0)