fixed handling of event base URL in UI

Change-Id: Iec853e4983ac27209fd8f91a7b25df7d7962e7e5
This commit is contained in:
Axel Uhl committed 2016-07-15 14:18:38 +02:00
1 parent 97c25d6bcd
commit e9a3cbbbce
3 files changed
+7 -3

No files matched your search

@@ -33,6 +33,7 @@ public class EventDetailsComposite extends Composite {
private final Label endDate;
private final Label isPublic;
private final Anchor officialWebsiteURL;
private final Anchor baseURL;
private final SimpleAnchorListComposite sailorsInfoWebsiteURLList;
private final Anchor eventOverviewURL;
private final SimpleStringListComposite courseAreaNamesList;
@@ -51,7 +52,7 @@ public class EventDetailsComposite extends Composite {
VerticalPanel vPanel = new VerticalPanel();
mainPanel.add(vPanel);
int rows = 16;
int rows = 17;
Grid grid = new Grid(rows, 2);
vPanel.add(grid);
@@ -64,6 +65,7 @@ public class EventDetailsComposite extends Composite {
endDate = createLabelAndValueWidget(grid, currentRow++, stringMessages.endDate(), "EndDateLabel");
isPublic = createLabelAndValueWidget(grid, currentRow++, stringMessages.isPublic(), "IsPublicLabel");
officialWebsiteURL = createLabelAndAnchorWidget(grid, currentRow++, stringMessages.eventOfficialWebsiteURL(), "OfficialWebsiteURLLabel");
baseURL = createLabelAndAnchorWidget(grid, currentRow++, stringMessages.eventBaseURL(), "BaseURLLabel");
sailorsInfoWebsiteURLList = createLabelAndAnchorListWidget(grid, currentRow++, stringMessages.eventSailorsInfoWebsiteURL(), "SailorsInfoWebsiteURLLabel");
eventOverviewURL = createLabelAndAnchorWidget(grid, currentRow++, stringMessages.eventOverviewURL(), "EventOverviewURLLabel");
courseAreaNamesList = createLabelAndValueListWidget(grid, currentRow++, stringMessages.courseAreas(), "CourseAreaValueList");
@@ -133,6 +135,8 @@ public class EventDetailsComposite extends Composite {
isPublic.setText(String.valueOf(event.isPublic));
officialWebsiteURL.setText(event.getOfficialWebsiteURL());
officialWebsiteURL.setHref(event.getOfficialWebsiteURL());
baseURL.setText(event.getBaseURL());
baseURL.setHref(event.getBaseURL());
sailorsInfoWebsiteURLList.setValues(new ArrayList<String>(event.getSailorsInfoWebsiteURLs().values()));
String regattaOverviewLink = EntryPointWithSettingsLinkFactory
.createRegattaOverviewLink(new RegattaOverviewBaseSettings(event.id, false));
@@ -206,7 +206,7 @@ public abstract class EventDialog extends DataEntryDialogWithBootstrap<EventDTO>
if (additionalWidget != null) {
panel.add(additionalWidget);
}
Grid formGrid = new Grid(9 + GWTLocaleUtil.getLanguageCountWithDefault(), 2);
Grid formGrid = new Grid(10 + GWTLocaleUtil.getLanguageCountWithDefault(), 2);
int rowIndex = 0;
formGrid.setWidget(rowIndex, 0, new Label(stringMessages.name() + ":"));
formGrid.setWidget(rowIndex++, 1, nameEntryField);
@@ -30,7 +30,7 @@ public class EventEditDialog extends EventDialog {
id = event.id;
officialWebsiteURLEntryField = createTextBox(event.getOfficialWebsiteURL());
officialWebsiteURLEntryField.setVisibleLength(50);
baseURLEntryField = createTextBox(event.getOfficialWebsiteURL());
baseURLEntryField = createTextBox(event.getBaseURL());
baseURLEntryField.setVisibleLength(50);
sailorsInfoWebsiteURLEntryFields = createTextBoxesForLocalesAndDefault(event.getSailorsInfoWebsiteURLs());
courseAreaNameList.setValue(new ArrayList<>(event.venue.getCourseAreas()));