eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-08 20:12:23 +00:00
Code Activity

Merge branch 'master' of ssh://trac@sapsailing.com/home/trac/git

Browse Source
This commit is contained in:
Kai Börnert committed 2018-04-12 11:15:05 +02:00
2 parents bbab535002 96d68ff07d
commit bc3aa4f854
2 files changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTOImpl.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class CompetitorDTOImpl extends CompetitorWithoutBoatDTOImpl implements C
@Override
public String getShortInfo() {
String result = null;
if (getShortName() != null) {
if (getShortName() != null && !getShortName().trim().isEmpty()) {
result = getShortName();
} else if (getBoat() != null) {
result = getBoat().getSailId() != null ? getBoat().getSailId() : getBoat().getName();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
+3 -1
View File
@@ -185,7 +185,9 @@ public class CompetitorEditDialog extends DataEntryDialog<CompetitorDTO> {
color = new InvalidColor(iae);
}
}
CompetitorDTO result = new CompetitorDTOImpl(name.getText(), shortName.getText(), color, email.getText(),
CompetitorDTO result = new CompetitorDTOImpl(name.getText(),
shortName.getText().trim().isEmpty() ? null : shortName.getText(), color,
email.getText().trim().isEmpty() ? null : email.getText(),
/* twoLetterIsoCountryCode */ null,
threeLetterIocCountryCode.getValue(threeLetterIocCountryCode.getSelectedIndex()),
/* countryName */ null, competitorToEdit.getIdAsString(),