bug5927: introduce constant for "none"; renamed action to COLORED_TAILS

This commit is contained in:
Axel Uhl
2023-12-23 12:19:14 +01:00
parent b8db74dc7b
commit 728d231faf
3 changed files with 6 additions and 5 deletions
@@ -67,7 +67,7 @@ public class SecuredDomainType extends HasPermissionsImpl {
SIMULATOR, SIMULATOR,
VIEWSTREAMLETS, VIEWSTREAMLETS,
VIEWANALYSISCHARTS, VIEWANALYSISCHARTS,
DETAILTYPES; COLORED_TAILS;
private static final Action[] ALL_ACTIONS = DefaultActions.plus(TrackedRaceActions.values()); private static final Action[] ALL_ACTIONS = DefaultActions.plus(TrackedRaceActions.values());
@@ -29,7 +29,7 @@ public class PremiumRole extends RolePrototype {
WildcardPermission.builder().withTypes(SecuredDomainType.TRACKED_RACE) WildcardPermission.builder().withTypes(SecuredDomainType.TRACKED_RACE)
.withActions(SecuredDomainType.TrackedRaceActions.VIEWANALYSISCHARTS).build(), .withActions(SecuredDomainType.TrackedRaceActions.VIEWANALYSISCHARTS).build(),
WildcardPermission.builder().withTypes(SecuredDomainType.TRACKED_RACE) WildcardPermission.builder().withTypes(SecuredDomainType.TRACKED_RACE)
.withActions(SecuredDomainType.TrackedRaceActions.DETAILTYPES).build(), .withActions(SecuredDomainType.TrackedRaceActions.COLORED_TAILS).build(),
WildcardPermission.builder().withTypes(SecuredDomainType.LEADERBOARD) WildcardPermission.builder().withTypes(SecuredDomainType.LEADERBOARD)
.withActions(SecuredDomainType.LeaderboardActions.PREMIUM_LEADERBOARD_INFORMATION).build()); .withActions(SecuredDomainType.LeaderboardActions.PREMIUM_LEADERBOARD_INFORMATION).build());
} }
@@ -2888,8 +2888,9 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
selectedDetailType = null; selectedDetailType = null;
metricOverlay.setVisible(false); metricOverlay.setVisible(false);
// create new premium list box // create new premium list box
SailingPremiumListBox lb = new SailingPremiumListBox(stringMessages.none(), "none", final String EMPTY_VALUE = "none";
TrackedRaceActions.DETAILTYPES, paywallResolver, raceMapLifecycle.getRaceDTO()); SailingPremiumListBox lb = new SailingPremiumListBox(stringMessages.none(), EMPTY_VALUE,
TrackedRaceActions.COLORED_TAILS, paywallResolver, raceMapLifecycle.getRaceDTO());
fillItemsFromAvailableDetailTypes(lb); fillItemsFromAvailableDetailTypes(lb);
lb.setVisibleItemCount(1); lb.setVisibleItemCount(1);
lb.addChangeHandler(new ChangeHandler() { lb.addChangeHandler(new ChangeHandler() {
@@ -2897,7 +2898,7 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
public void onChange(ChangeEvent event) { public void onChange(ChangeEvent event) {
String value = lb.getSelectedValue(); String value = lb.getSelectedValue();
DetailType previous = selectedDetailType; DetailType previous = selectedDetailType;
if (value == null || value.equals("none")) { if (value == null || value.equals(EMPTY_VALUE)) {
selectedDetailType = null; selectedDetailType = null;
metricOverlay.setVisible(false); metricOverlay.setVisible(false);
} else { } else {