Merge remote-tracking branch 'origin/master'

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java

@@ -74,7 +74,9 @@ public abstract class RegattaLeaderboardDialog extends AbstractLeaderboardDialog
             }
             regattaDefinesDiscardsLabel.setVisible(true);
         } else {
-            discardThresholdBoxes.getWidget().setVisible(true);
+            if (discardThresholdBoxes != null) {
+                discardThresholdBoxes.getWidget().setVisible(true);
+            }
             regattaDefinesDiscardsLabel.setVisible(false);
         }
     }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardEditDialog.java

@@ -23,7 +23,7 @@ public class RegattaLeaderboardEditDialog extends RegattaLeaderboardDialog {
 
         regattaListBox = createSortedRegattaListBox(existingRegattas, leaderboardDescriptor.getRegattaName());
         regattaListBox.setEnabled(false);
-        if (leaderboardDescriptor.getDiscardThresholds() != null) {
+        if (!getSelectedRegatta().definesSeriesDiscardThresholds()) {
             discardThresholdBoxes = new DiscardThresholdBoxes(this, leaderboardDescriptor.getDiscardThresholds(), stringMessages);
         } // else, the regatta leaderboard obtains its result discarding rule implicitly from the underlying regatta
         adjustVisibilityOfResultDiscardingRuleComponent();